Skip to content

Commit d3fdecf

Browse files
xmavxmav
authored
Merge pull request #4121 from magento-tsg/2.3-develop-mftf-pr15
[TSG] MTF fixes for 2.3 (pr15) (2.3.2)
2 parents 6a394d1 + 40482e1 commit d3fdecf

10 files changed

+22
-15
lines changed

‎dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityPartOneTest.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525
<constraint name="Magento\Catalog\Test\Constraint\AssertProductInventoryMaxAllowedQty" />
2626
</variation>
2727
<variation name="CreateSimpleProductEntityTestVariation13">
28+
<data name="tag" xsi:type="string">mftf_migrated:yes</data>
29+
<data name="issue" xsi:type="string">MAGETWO-48850: Filtering Category Products using scope selector</data>
2830
<data name="description" xsi:type="string">Create simple product and check search by sku</data>
2931
<data name="product/data/url_key" xsi:type="string">simple-product-%isolation%</data>
3032
<data name="product/data/name" xsi:type="string">Simple Product %isolation%</data>
@@ -42,6 +44,8 @@
4244
<constraint name="Magento\Catalog\Test\Constraint\AssertProductPage" />
4345
</variation>
4446
<variation name="CreateSimpleProductEntityTestVariation14">
47+
<data name="tag" xsi:type="string">mftf_migrated:yes</data>
48+
<data name="issue" xsi:type="string">MC-6220: Add products to wishlist from Category page with multiple wishlist enabled</data>
4549
<data name="description" xsi:type="string">Create simple product and check visibility in category</data>
4650
<data name="product/data/url_key" xsi:type="string">simple-product-%isolation%</data>
4751
<data name="product/data/name" xsi:type="string">Simple Product %isolation%</data>

‎dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityPartTwoTest.xml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
99
<testCase name="Magento\Catalog\Test\TestCase\Product\CreateSimpleProductEntityPartTwoTest" summary="Create Simple Product" ticketId="MAGETWO-23414">
1010
<variation name="CreateSimpleProductEntityTestVariation23" summary="Create Simple Product with Creating New Category (Required Fields Only)" ticketId="MAGETWO-27293">
11+
<data name="tag" xsi:type="string">mftf_migrated:yes</data>
12+
<data name="issue" xsi:type="string">MC-234: Admin should be able to create category from the product page</data>
1113
<data name="product/data/category_ids/new_category" xsi:type="string">yes</data>
1214
<data name="product/data/category_ids/dataset" xsi:type="string">default_subcategory_without_url_key</data>
1315
<data name="product/data/website_ids/0/dataset" xsi:type="string">default</data>
@@ -23,6 +25,8 @@
2325
<constraint name="Magento\UrlRewrite\Test\Constraint\AssertUrlRewriteProductInGrid" />
2426
</variation>
2527
<variation name="CreateSimpleProductEntityTestVariation24" summary="Create Simple Product and Assigning It to Category" ticketId="MAGETWO-12514">
28+
<data name="tag" xsi:type="string">mftf_migrated:yes</data>
29+
<data name="issue" xsi:type="string">MAGETWO-23414: Create Simple Product</data>
2630
<data name="product/data/url_key" xsi:type="string">simple-product-%isolation%</data>
2731
<data name="product/data/name" xsi:type="string">Simple Product %isolation%</data>
2832
<data name="product/data/sku" xsi:type="string">simple_sku_%isolation%</data>
@@ -79,6 +83,8 @@
7983
<constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
8084
</variation>
8185
<variation name="CreateSimpleProductEntityTestVariation28" summary="Create product with tier price for not logged in customer">
86+
<data name="tag" xsi:type="string">mftf_migrated:yes</data>
87+
<data name="issue" xsi:type="string">MAGETWO-68921: Apply Tier Price to a product</data>
8288
<data name="product/data/url_key" xsi:type="string">simple-product-%isolation%</data>
8389
<data name="product/data/name" xsi:type="string">Simple Product %isolation%</data>
8490
<data name="product/data/sku" xsi:type="string">simple_sku_%isolation%</data>
@@ -118,6 +124,8 @@
118124
<constraint name="Magento\Catalog\Test\Constraint\AssertProductInCart" />
119125
</variation>
120126
<variation name="CreateSimpleProductEntityWithTierPriceTestVariation1" summary="Create Simple Product with fixed tier price.">
127+
<data name="tag" xsi:type="string">mftf_migrated:yes</data>
128+
<data name="issue" xsi:type="string">MAGETWO-68921: Apply Tier Price to a product</data>
121129
<data name="product/data/url_key" xsi:type="string">simple-product-%isolation%</data>
122130
<data name="product/data/name" xsi:type="string">Simple Product %isolation%</data>
123131
<data name="product/data/sku" xsi:type="string">simple_sku_%isolation%</data>
@@ -127,6 +135,8 @@
127135
<constraint name="Magento\Catalog\Test\Constraint\AssertProductTierPriceInCart" />
128136
</variation>
129137
<variation name="CreateSimpleProductEntityWithTierPriceTestVariation2" summary="Create Simple Product with percentage tier price.">
138+
<data name="tag" xsi:type="string">mftf_migrated:yes</data>
139+
<data name="issue" xsi:type="string">MAGETWO-68921: Apply Tier Price to a product</data>
130140
<data name="product/data/url_key" xsi:type="string">simple-product-%isolation%</data>
131141
<data name="product/data/name" xsi:type="string">Simple Product %isolation%</data>
132142
<data name="product/data/sku" xsi:type="string">simple_sku_%isolation%</data>

‎dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityTest.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ public function testCreate(
7979
$flushCache = false,
8080
$configData = null
8181
) {
82-
$this->markTestIncomplete('https://github.com/magento-engcom/msi/issues/1620');
8382

8483
$this->configData = $configData;
8584
$this->flushCache = $flushCache;

‎dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityTest.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,8 @@
182182
<constraint name="Magento\Catalog\Test\Constraint\AssertProductPage" />
183183
</variation>
184184
<variation name="CreateSimpleProductEntityTestVariation10" summary="Create in stock product and check threshold" ticketId="MAGETWO-43345">
185+
<data name="issue" xsi:type="string">https://github.com/magento-engcom/msi/issues/1620</data>
186+
<data name="tag" xsi:type="string">to_maintain:yes</data>
185187
<data name="configData" xsi:type="string">inventory_threshold_5</data>
186188
<data name="product/data/url_key" xsi:type="string">simple-product-%isolation%</data>
187189
<data name="product/data/name" xsi:type="string">Simple Product %isolation%</data>

‎dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityTest.xml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
99
<testCase name="Magento\Catalog\Test\TestCase\ProductAttribute\CreateProductAttributeEntityTest" summary="Create Product Attribute" ticketId="MAGETWO-24767">
1010
<variation name="CreateProductAttributeEntityTestVariation1">
11-
<data name="tag" xsi:type="string">to_maintain:yes</data>
1211
<data name="attributeSet/dataset" xsi:type="string">custom_attribute_set</data>
1312
<data name="productAttribute/data/frontend_label" xsi:type="string">Text_Field_Admin_%isolation%</data>
1413
<data name="productAttribute/data/frontend_input" xsi:type="string">Text Field</data>
@@ -60,7 +59,6 @@
6059
<data name="productAttribute/data/used_in_product_listing" xsi:type="string">Yes</data>
6160
<data name="productAttribute/data/is_used_for_promo_rules" xsi:type="string">Yes</data>
6261
<data name="productAttribute/data/used_for_sort_by" xsi:type="string">Yes</data>
63-
<data name="tag" xsi:type="string">to_maintain:yes</data>
6462
<constraint name="Magento\Catalog\Test\Constraint\AssertProductAttributeInGrid" />
6563
<constraint name="Magento\Catalog\Test\Constraint\AssertAttributeForm" />
6664
<constraint name="Magento\CatalogSearch\Test\Constraint\AssertAdvancedSearchProductByAttribute" />
@@ -69,7 +67,6 @@
6967
<constraint name="Magento\CatalogRule\Test\Constraint\AssertProductAttributeIsUsedPromoRules" />
7068
</variation>
7169
<variation name="CreateProductAttributeEntityTestVariation4">
72-
<data name="tag" xsi:type="string">to_maintain:yes</data>
7370
<data name="attributeSet/dataset" xsi:type="string">custom_attribute_set</data>
7471
<data name="productAttribute/data/frontend_label" xsi:type="string">Yes/No_Admin_%isolation%</data>
7572
<data name="productAttribute/data/frontend_input" xsi:type="string">Yes/No</data>
@@ -86,6 +83,7 @@
8683
<constraint name="Magento\Catalog\Test\Constraint\AssertAddedProductAttributeOnProductForm" />
8784
</variation>
8885
<variation name="CreateProductAttributeEntityTestVariation5" summary="Create custom multiple select attribute product field" ticketId="MAGETWO-14862">
86+
<data name="tag" xsi:type="string">mftf_migrated:yes</data>
8987
<data name="attributeSet/dataset" xsi:type="string">custom_attribute_set</data>
9088
<data name="productAttribute/data/frontend_label" xsi:type="string">Multiple_Select_Admin_%isolation%</data>
9189
<data name="productAttribute/data/frontend_input" xsi:type="string">Multiple Select</data>
@@ -102,7 +100,6 @@
102100
<data name="productAttribute/data/is_html_allowed_on_front" xsi:type="string">Yes</data>
103101
<data name="productAttribute/data/is_visible_on_front" xsi:type="string">Yes</data>
104102
<data name="productAttribute/data/used_in_product_listing" xsi:type="string">Yes</data>
105-
<data name="tag" xsi:type="string">to_maintain:yes</data>
106103
<constraint name="Magento\Catalog\Test\Constraint\AssertProductAttributeInGrid" />
107104
<constraint name="Magento\Catalog\Test\Constraint\AssertAttributeForm" />
108105
<constraint name="Magento\Catalog\Test\Constraint\AssertAddedProductAttributeOnProductForm" />
@@ -178,7 +175,6 @@
178175
<constraint name="Magento\Catalog\Test\Constraint\AssertProductAttributeIsFilterableInSearch" />
179176
</variation>
180177
<variation name="CreateProductAttributeEntityTestVariation8">
181-
<data name="tag" xsi:type="string">to_maintain:yes</data>
182178
<data name="attributeSet/dataset" xsi:type="string">custom_attribute_set</data>
183179
<data name="productAttribute/data/frontend_label" xsi:type="string">Fixed_Product_Tax_Admin_%isolation%</data>
184180
<data name="productAttribute/data/frontend_input" xsi:type="string">Fixed Product Tax</data>
@@ -195,7 +191,6 @@
195191
<constraint name="Magento\Catalog\Test\Constraint\AssertAddedProductAttributeOnProductForm" />
196192
</variation>
197193
<variation name="CreateProductAttributeEntityTestVariation9">
198-
<data name="tag" xsi:type="string">to_maintain:yes</data>
199194
<data name="attributeSet/dataset" xsi:type="string">custom_attribute_set</data>
200195
<data name="productAttribute/data/frontend_label" xsi:type="string">Text_Field_Admin_%isolation%</data>
201196
<data name="productAttribute/data/frontend_input" xsi:type="string">Text Field</data>

‎dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/UpdateAttributeSetTest.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
99
<testCase name="Magento\Catalog\Test\TestCase\ProductAttribute\UpdateAttributeSetTest" summary="Update Attribute Set" ticketId="MAGETWO-26251">
1010
<variation name="UpdateAttributeSetTestVariation1">
11-
<data name="tag" xsi:type="string">stable:no</data>
1211
<data name="attributeSet/data/attribute_set_name" xsi:type="string">AttributeSetEdit1%isolation%</data>
1312
<data name="attributeSet/data/group" xsi:type="string">Custom-group%isolation%</data>
1413
<data name="attributeSetOriginal/dataset" xsi:type="string">custom_attribute_set</data>

‎dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Totals.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@ public function getGrandTotal()
117117
*/
118118
public function getGrandTotalIncludingTax()
119119
{
120+
$this->waitForGrandTotal();
120121
$priceElement = $this->_rootElement->find($this->grandTotalInclTax, Locator::SELECTOR_CSS);
121122
return $priceElement->isVisible() ? $this->escapeCurrency($priceElement->getText()) : null;
122123
}

‎dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateProductFromMiniShoppingCartEntityTest.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<constraint name="Magento\Checkout\Test\Constraint\AssertCustomerIsRedirectedToCheckoutFromCart" />
2727
</variation>
2828
<variation name="UpdateProductFromMiniShoppingCartEntityTestVariation2" summary="Update Configurable and verify previous product was updated to new one in shopping cart and mini shopping cart">
29-
<data name="tag" xsi:type="string">test_type:extended_acceptance_test, to_maintain:yes, severity:S0</data>
29+
<data name="tag" xsi:type="string">test_type:extended_acceptance_test, severity:S0</data>
3030
<data name="originalProduct/0" xsi:type="string">configurableProduct::default</data>
3131
<data name="checkoutData/dataset" xsi:type="string">configurable_update_mini_shopping_cart</data>
3232
<constraint name="Magento\Checkout\Test\Constraint\AssertCartItemsOptions" />
@@ -35,7 +35,7 @@
3535
<constraint name="Magento\Checkout\Test\Constraint\AssertProductOptionsAbsentInShoppingCart" />
3636
</variation>
3737
<variation name="UpdateProductFromMiniShoppingCartEntityTestVariation3" summary="Update Bundle and verify previous product was updated to new one in shopping cart and mini shopping cart">
38-
<data name="tag" xsi:type="string">test_type:extended_acceptance_test, to_maintain:yes, severity:S0</data>
38+
<data name="tag" xsi:type="string">test_type:extended_acceptance_test, severity:S0</data>
3939
<data name="originalProduct/0" xsi:type="string">bundleProduct::bundle_fixed_product</data>
4040
<data name="checkoutData/dataset" xsi:type="string">bundle_update_mini_shopping_cart</data>
4141
<constraint name="Magento\Checkout\Test\Constraint\AssertCartItemsOptions" />
@@ -44,7 +44,7 @@
4444
<constraint name="Magento\Checkout\Test\Constraint\AssertProductOptionsAbsentInShoppingCart" />
4545
</variation>
4646
<variation name="UpdateProductFromMiniShoppingCartEntityTestVariation4" summary="Update Downloadable and check previous link was updated to new one in shopping cart and mini shopping cart">
47-
<data name="tag" xsi:type="string">test_type:extended_acceptance_test, to_maintain:yes, severity:S1</data>
47+
<data name="tag" xsi:type="string">test_type:extended_acceptance_test, severity:S1</data>
4848
<data name="originalProduct/0" xsi:type="string">downloadableProduct::with_two_separately_links</data>
4949
<data name="checkoutData/dataset" xsi:type="string">downloadable_update_mini_shopping_cart</data>
5050
<constraint name="Magento\Checkout\Test\Constraint\AssertCartItemsOptions" />
@@ -53,7 +53,7 @@
5353
<constraint name="Magento\Checkout\Test\Constraint\AssertProductOptionsAbsentInShoppingCart" />
5454
</variation>
5555
<variation name="UpdateProductFromMiniShoppingCartEntityTestVariation5" summary="Update Virtual product in mini shopping cart">
56-
<data name="tag" xsi:type="string">test_type:extended_acceptance_test, to_maintain:yes, severity:S1</data>
56+
<data name="tag" xsi:type="string">test_type:extended_acceptance_test, severity:S1</data>
5757
<data name="originalProduct/0" xsi:type="string">catalogProductVirtual::default</data>
5858
<data name="checkoutData/dataset" xsi:type="string">virtual_update_mini_shopping_cart</data>
5959
<constraint name="Magento\Checkout\Test\Constraint\AssertProductDataInMiniShoppingCart" />

‎dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/CreateGroupedProductEntityTest.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@
5757
<constraint name="Magento\Catalog\Test\Constraint\AssertProductOutOfStock" />
5858
</variation>
5959
<variation name="CreateGroupedProductEntityTestVariation5" summary="Create with no required products">
60-
<data name="tag" xsi:type="string">stable:no</data>
6160
<data name="product/data/url_key" xsi:type="string">test-grouped-product-%isolation%</data>
6261
<data name="product/data/name" xsi:type="string">GroupedProduct %isolation%</data>
6362
<data name="product/data/sku" xsi:type="string">GroupedProduct_sku%isolation%</data>
@@ -110,7 +109,6 @@
110109
<constraint name="Magento\Catalog\Test\Constraint\AssertProductPage" />
111110
</variation>
112111
<variation name="CreateGroupedProductEntityTestVariation10" summary="Create Grouped Product and Assign it on Custom Website">
113-
<data name="tag" xsi:type="string">stable:no</data>
114112
<data name="product/data/url_key" xsi:type="string">test-grouped-product-%isolation%</data>
115113
<data name="product/data/name" xsi:type="string">GroupedProduct %isolation%</data>
116114
<data name="product/data/sku" xsi:type="string">GroupedProduct_sku%isolation%</data>

‎dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/TaxWithCrossBorderTest.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ class TaxWithCrossBorderTest extends Injectable
3737
{
3838
/* tags */
3939
const MVP = 'yes';
40-
const STABLE = 'no';
4140
/* end tags */
4241

4342
/**

0 commit comments

Comments
 (0)