Skip to content

Commit 6325f9d

Browse files
author
Dmytro Aponasenko
committed
MTA-1602: Sync qmt repository with mainline - Sprint 6
1 parent b7ab227 commit 6325f9d

11 files changed

+812
-735
lines changed

‎dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/CreateBundleProductEntityTest.xml

Lines changed: 622 additions & 565 deletions
Large diffs are not rendered by default.

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
* See COPYING.txt for license details.
66
*/
77
-->
8-
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../etc/global/variations.xsd">
9-
<testCase name="AddToCartCrossSellTest">
10-
<variation name="AddToCartCrossSellTestVariation1">
11-
<data name="products">simple1::catalogProductSimple::product_with_category,simple2::catalogProductSimple::product_with_category,config1::configurableProduct::two_options_with_fixed_price</data>
12-
<data name="promotedProducts">simple1:simple2,config1;config1:simple2</data>
13-
<data name="navigateProductsOrder">simple1,config1,simple2</data>
14-
<data name="productsToVerify">simple1:simple2,config1;config1:simple2;simple2:</data>
15-
<data name="tag">test_type:acceptance_test</data>
16-
</variation>
17-
</testCase>
8+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
9+
<testCase name="AddToCartCrossSellTest">
10+
<variation name="AddToCartCrossSellTestVariation1" method="test">
11+
<data name="products" xsi:type="string">simple1::catalogProductSimple::product_with_category,simple2::catalogProductSimple::product_with_category,config1::configurableProduct::two_options_with_fixed_price</data>
12+
<data name="promotedProducts" xsi:type="string">simple1:simple2,config1;config1:simple2</data>
13+
<data name="navigateProductsOrder" xsi:type="string">simple1,config1,simple2</data>
14+
<data name="productsToVerify" xsi:type="string">simple1:simple2,config1;config1:simple2;simple2:</data>
15+
<data name="tag" xsi:type="string">test_type:acceptance_test</data>
16+
</variation>
17+
</testCase>
1818
</config>

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55
* See COPYING.txt for license details.
66
*/
77
-->
8-
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../etc/global/variations.xsd">
9-
<testCase name="NavigateRelatedProductsTest">
10-
<variation name="NavigateRelatedProductsTestVariation1">
11-
<data name="products">simple1::catalogProductSimple::product_with_category,simple2::catalogProductSimple::product_with_category,config1::configurableProduct::two_options_with_fixed_price</data>
12-
<data name="selectable">simple1:yes,simple2:yes,config1:no</data>
13-
<data name="promotedProducts">simple1:simple2,config1;config1:simple2</data>
14-
<data name="navigateProductsOrder">simple1,config1</data>
15-
<data name="productsToVerify">simple1:simple2,config1;config1:simple2</data>
16-
<data name="tag">test_type:acceptance_test</data>
17-
</variation>
18-
</testCase>
8+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
9+
<testCase name="NavigateRelatedProductsTest">
10+
<variation name="NavigateRelatedProductsTestVariation1" method="test">
11+
<data name="products" xsi:type="string">simple1::catalogProductSimple::product_with_category,simple2::catalogProductSimple::product_with_category,config1::configurableProduct::two_options_with_fixed_price</data>
12+
<data name="selectable" xsi:type="string">simple1:yes,simple2:yes,config1:no</data>
13+
<data name="promotedProducts" xsi:type="string">simple1:simple2,config1;config1:simple2</data>
14+
<data name="navigateProductsOrder" xsi:type="string">simple1,config1</data>
15+
<data name="productsToVerify" xsi:type="string">simple1:simple2,config1;config1:simple2</data>
16+
<data name="tag" xsi:type="string">test_type:acceptance_test</data>
17+
</variation>
18+
</testCase>
1919
</config>

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
* See COPYING.txt for license details.
66
*/
77
-->
8-
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../etc/global/variations.xsd">
9-
<testCase name="NavigateUpSellProductsTest">
10-
<variation name="NavigateUpSellProductsTestVariation1">
11-
<data name="products">simple1::catalogProductSimple::product_with_category,simple2::catalogProductSimple::product_with_category,config1::configurableProduct::two_options_with_fixed_price</data>
12-
<data name="promotedProducts">simple1:simple2,config1;config1:simple2</data>
13-
<data name="navigateProductsOrder">simple1,config1,simple2</data>
14-
<data name="productsToVerify">simple1:simple2,config1;config1:simple2;simple2:</data>
15-
<data name="tag">test_type:acceptance_test</data>
16-
</variation>
17-
</testCase>
8+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
9+
<testCase name="NavigateUpSellProductsTest">
10+
<variation name="NavigateUpSellProductsTestVariation1" method="test">
11+
<data name="products" xsi:type="string">simple1::catalogProductSimple::product_with_category,simple2::catalogProductSimple::product_with_category,config1::configurableProduct::two_options_with_fixed_price</data>
12+
<data name="promotedProducts" xsi:type="string">simple1:simple2,config1;config1:simple2</data>
13+
<data name="navigateProductsOrder" xsi:type="string">simple1,config1,simple2</data>
14+
<data name="productsToVerify" xsi:type="string">simple1:simple2,config1;config1:simple2;simple2:</data>
15+
<data name="tag" xsi:type="string">test_type:acceptance_test</data>
16+
</variation>
17+
</testCase>
1818
</config>

‎dev/tests/functional/tests/app/Magento/Customer/Test/etc/constraint.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,20 @@
1616
<argument name="registerPage">Magento\Customer\Test\Page\CustomerAccountCreate</argument>
1717
</constraint>
1818
<constraint name="assertCustomerInGrid" module="Magento_Customer" severity="middle">
19-
<argument name="customer">Magento\Customer\Test\Fixture\CustomerInjectable</argument>
19+
<argument name="customer">Magento\Customer\Test\Fixture\Customer</argument>
2020
<argument name="pageCustomerIndex">Magento\Customer\Test\Page\Adminhtml\CustomerIndex</argument>
2121
</constraint>
2222
<constraint name="assertCustomerNotInGrid" module="Magento_Customer" severity="middle">
23-
<argument name="customer">Magento\Customer\Test\Fixture\CustomerInjectable</argument>
23+
<argument name="customer">Magento\Customer\Test\Fixture\Customer</argument>
2424
<argument name="customerIndexPage">Magento\Customer\Test\Page\Adminhtml\CustomerIndex</argument>
2525
</constraint>
2626
<constraint name="assertCustomerForm" module="Magento_Customer" severity="middle">
27-
<argument name="customer">Magento\Customer\Test\Fixture\CustomerInjectable</argument>
27+
<argument name="customer">Magento\Customer\Test\Fixture\Customer</argument>
2828
<argument name="pageCustomerIndex">Magento\Customer\Test\Page\Adminhtml\CustomerIndex</argument>
2929
<argument name="pageCustomerIndexEdit">Magento\Customer\Test\Page\Adminhtml\CustomerIndexEdit</argument>
3030
</constraint>
3131
<constraint name="assertCustomerInvalidEmail" module="Magento_Customer" severity="middle">
32-
<argument name="customer">Magento\Customer\Test\Fixture\CustomerInjectable</argument>
32+
<argument name="customer">Magento\Customer\Test\Fixture\Customer</argument>
3333
<argument name="addresses">Magento\Customer\Test\Fixture\AddressInjectable</argument>
3434
<argument name="pageCustomerIndexNew">Magento\Customer\Test\Page\Adminhtml\CustomerIndexNew</argument>
3535
</constraint>

‎dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ConfigureProductInCustomerWishlistOnFrontendTest.xml

Lines changed: 28 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -5,28 +5,32 @@
55
* See COPYING.txt for license details.
66
*/
77
-->
8-
<<<<<<< HEAD
9-
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../etc/global/variations.xsd">
10-
<testCase name="ConfigureProductInCustomerWishlistOnFrontendTest">
11-
<variation name="ConfigureProductInCustomerWishlistOnFrontendTestVariation1">
12-
<data name="product">catalogProductSimple::with_two_custom_option</data>
13-
<data name="constraint">assertProductIsPresentInWishlist, assertProductDetailsInWishlist</data>
14-
</variation>
15-
<variation name="ConfigureProductInCustomerWishlistOnFrontendTestVariation2">
16-
<data name="product">configurableProduct::default</data>
17-
<data name="constraint">assertProductIsPresentInWishlist, assertProductDetailsInWishlist</data>
18-
</variation>
19-
<variation name="ConfigureProductInCustomerWishlistOnFrontendTestVariation3">
20-
<data name="product">bundleProduct::bundle_dynamic_product</data>
21-
<data name="constraint">assertProductIsPresentInWishlist, assertProductDetailsInWishlist</data>
22-
</variation>
23-
<variation name="ConfigureProductInCustomerWishlistOnFrontendTestVariation4">
24-
<data name="product">downloadableProduct::with_two_separately_links</data>
25-
<data name="constraint">assertProductIsPresentInWishlist, assertProductDetailsInWishlist</data>
26-
</variation>
27-
<variation name="ConfigureProductInCustomerWishlistOnFrontendTestVariation5">
28-
<data name="product">groupedProduct::three_simple_products</data>
29-
<data name="constraint">assertProductIsPresentInWishlist, assertProductDetailsInWishlist</data>
30-
</variation>
31-
</testCase>
8+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
9+
<testCase name="ConfigureProductInCustomerWishlistOnFrontendTest">
10+
<variation name="ConfigureProductInCustomerWishlistOnFrontendTestVariation1" firstConstraint="assertProductIsPresentInWishlist" method="test">
11+
<data name="product" xsi:type="string">catalogProductSimple::with_two_custom_option</data>
12+
<constraint name="assertProductIsPresentInWishlist" next="assertProductDetailsInWishlist"/>
13+
<constraint name="assertProductDetailsInWishlist" prev="assertProductIsPresentInWishlist"/>
14+
</variation>
15+
<variation name="ConfigureProductInCustomerWishlistOnFrontendTestVariation2" firstConstraint="assertProductIsPresentInWishlist" method="test">
16+
<data name="product" xsi:type="string">configurableProduct::default</data>
17+
<constraint name="assertProductIsPresentInWishlist" next="assertProductDetailsInWishlist"/>
18+
<constraint name="assertProductDetailsInWishlist" prev="assertProductIsPresentInWishlist"/>
19+
</variation>
20+
<variation name="ConfigureProductInCustomerWishlistOnFrontendTestVariation3" firstConstraint="assertProductIsPresentInWishlist" method="test">
21+
<data name="product" xsi:type="string">bundleProduct::bundle_dynamic_product</data>
22+
<constraint name="assertProductIsPresentInWishlist" next="assertProductDetailsInWishlist"/>
23+
<constraint name="assertProductDetailsInWishlist" prev="assertProductIsPresentInWishlist"/>
24+
</variation>
25+
<variation name="ConfigureProductInCustomerWishlistOnFrontendTestVariation4" firstConstraint="assertProductIsPresentInWishlist" method="test">
26+
<data name="product" xsi:type="string">downloadableProduct::with_two_separately_links</data>
27+
<constraint name="assertProductIsPresentInWishlist" next="assertProductDetailsInWishlist"/>
28+
<constraint name="assertProductDetailsInWishlist" prev="assertProductIsPresentInWishlist"/>
29+
</variation>
30+
<variation name="ConfigureProductInCustomerWishlistOnFrontendTestVariation5" firstConstraint="assertProductIsPresentInWishlist" method="test">
31+
<data name="product" xsi:type="string">groupedProduct::three_simple_products</data>
32+
<constraint name="assertProductIsPresentInWishlist" next="assertProductDetailsInWishlist"/>
33+
<constraint name="assertProductDetailsInWishlist" prev="assertProductIsPresentInWishlist"/>
34+
</variation>
35+
</testCase>
3236
</config>

‎dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/DeleteProductFromCustomerWishlistOnBackendTest.xml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55
* See COPYING.txt for license details.
66
*/
77
-->
8-
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../etc/global/variations.xsd">
9-
<testCase name="DeleteProductFromCustomerWishlistOnBackendTest">
10-
<variation name="DeleteProductFromCustomerWishlistOnBackendTestVariation1">
11-
<data name="product">configurableProduct::default</data>
12-
<data name="constraint">assertProductsIsAbsentInWishlist</data>
13-
</variation>
14-
<variation name="DeleteProductFromCustomerWishlistOnBackendTestVariation2">
15-
<data name="product">catalogProductSimple::simple_for_composite_products</data>
16-
<data name="constraint">assertProductsIsAbsentInWishlist</data>
17-
</variation>
18-
</testCase>
8+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
9+
<testCase name="DeleteProductFromCustomerWishlistOnBackendTest">
10+
<variation name="DeleteProductFromCustomerWishlistOnBackendTestVariation1" firstConstraint="assertProductsIsAbsentInWishlist" method="test">
11+
<data name="product" xsi:type="string">configurableProduct::default</data>
12+
<constraint name="assertProductsIsAbsentInWishlist"/>
13+
</variation>
14+
<variation name="DeleteProductFromCustomerWishlistOnBackendTestVariation2" firstConstraint="assertProductsIsAbsentInWishlist" method="test">
15+
<data name="product" xsi:type="string">catalogProductSimple::simple_for_composite_products</data>
16+
<constraint name="assertProductsIsAbsentInWishlist"/>
17+
</variation>
18+
</testCase>
1919
</config>

‎dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/DeleteProductsFromWishlistOnFrontendTest.xml

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -5,46 +5,46 @@
55
* See COPYING.txt for license details.
66
*/
77
-->
8-
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../etc/global/variations.xsd">
9-
<testCase name="DeleteProductsFromWishlistOnFrontendTest">
10-
<variation name="DeleteProductsFromWishlistOnFrontendTestVariation1">
11-
<data name="products">catalogProductSimple::product_100_dollar,catalogProductVirtual::product_50_dollar</data>
12-
<data name="removedProductsIndex">1</data>
13-
<data name="constraint">assertProductsIsAbsentInWishlist</data>
14-
</variation>
15-
<variation name="DeleteProductsFromWishlistOnFrontendTestVariation2">
16-
<data name="products">catalogProductVirtual::product_50_dollar</data>
17-
<data name="removedProductsIndex">1</data>
18-
<data name="constraint">assertWishlistIsEmpty</data>
19-
</variation>
20-
<variation name="DeleteProductsFromWishlistOnFrontendTestVariation3">
21-
<data name="products">catalogProductSimple::default,catalogProductVirtual::product_50_dollar,catalogProductSimple::default,catalogProductVirtual::product_50_dollar</data>
22-
<data name="constraint">assertWishlistIsEmpty</data>
23-
</variation>
24-
<variation name="DeleteProductsFromWishlistOnFrontendTestVariation4">
25-
<data name="products">bundleProduct::bundle_dynamic_product</data>
26-
<data name="removedProductsIndex">1</data>
27-
<data name="constraint">assertWishlistIsEmpty</data>
28-
</variation>
29-
<variation name="DeleteProductsFromWishlistOnFrontendTestVariation5">
30-
<data name="products">bundleProduct::bundle_fixed_product</data>
31-
<data name="removedProductsIndex">1</data>
32-
<data name="constraint">assertWishlistIsEmpty</data>
33-
</variation>
34-
<variation name="DeleteProductsFromWishlistOnFrontendTestVariation6">
35-
<data name="products">configurableProduct::default</data>
36-
<data name="removedProductsIndex">1</data>
37-
<data name="constraint">assertWishlistIsEmpty</data>
38-
</variation>
39-
<variation name="DeleteProductsFromWishlistOnFrontendTestVariation7">
40-
<data name="products">downloadableProduct::with_two_separately_links</data>
41-
<data name="removedProductsIndex">1</data>
42-
<data name="constraint">assertWishlistIsEmpty</data>
43-
</variation>
44-
<variation name="DeleteProductsFromWishlistOnFrontendTestVariation8">
45-
<data name="products">groupedProduct::three_simple_products</data>
46-
<data name="removedProductsIndex">1</data>
47-
<data name="constraint">assertWishlistIsEmpty</data>
48-
</variation>
49-
</testCase>
8+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
9+
<testCase name="DeleteProductsFromWishlistOnFrontendTest">
10+
<variation name="DeleteProductsFromWishlistOnFrontendTestVariation1" firstConstraint="assertProductsIsAbsentInWishlist" method="test">
11+
<data name="products" xsi:type="string">catalogProductSimple::product_100_dollar,catalogProductVirtual::product_50_dollar</data>
12+
<data name="removedProductsIndex" xsi:type="string">1</data>
13+
<constraint name="assertProductsIsAbsentInWishlist"/>
14+
</variation>
15+
<variation name="DeleteProductsFromWishlistOnFrontendTestVariation2" firstConstraint="assertWishlistIsEmpty" method="test">
16+
<data name="products" xsi:type="string">catalogProductVirtual::product_50_dollar</data>
17+
<data name="removedProductsIndex" xsi:type="string">1</data>
18+
<constraint name="assertWishlistIsEmpty"/>
19+
</variation>
20+
<variation name="DeleteProductsFromWishlistOnFrontendTestVariation3" firstConstraint="assertWishlistIsEmpty" method="test">
21+
<data name="products" xsi:type="string">catalogProductSimple::default,catalogProductVirtual::product_50_dollar,catalogProductSimple::default,catalogProductVirtual::product_50_dollar</data>
22+
<constraint name="assertWishlistIsEmpty"/>
23+
</variation>
24+
<variation name="DeleteProductsFromWishlistOnFrontendTestVariation4" firstConstraint="assertWishlistIsEmpty" method="test">
25+
<data name="products" xsi:type="string">bundleProduct::bundle_dynamic_product</data>
26+
<data name="removedProductsIndex" xsi:type="string">1</data>
27+
<constraint name="assertWishlistIsEmpty"/>
28+
</variation>
29+
<variation name="DeleteProductsFromWishlistOnFrontendTestVariation5" firstConstraint="assertWishlistIsEmpty" method="test">
30+
<data name="products" xsi:type="string">bundleProduct::bundle_fixed_product</data>
31+
<data name="removedProductsIndex" xsi:type="string">1</data>
32+
<constraint name="assertWishlistIsEmpty"/>
33+
</variation>
34+
<variation name="DeleteProductsFromWishlistOnFrontendTestVariation6" firstConstraint="assertWishlistIsEmpty" method="test">
35+
<data name="products" xsi:type="string">configurableProduct::default</data>
36+
<data name="removedProductsIndex" xsi:type="string">1</data>
37+
<constraint name="assertWishlistIsEmpty"/>
38+
</variation>
39+
<variation name="DeleteProductsFromWishlistOnFrontendTestVariation7" firstConstraint="assertWishlistIsEmpty" method="test">
40+
<data name="products" xsi:type="string">downloadableProduct::with_two_separately_links</data>
41+
<data name="removedProductsIndex" xsi:type="string">1</data>
42+
<constraint name="assertWishlistIsEmpty"/>
43+
</variation>
44+
<variation name="DeleteProductsFromWishlistOnFrontendTestVariation8" firstConstraint="assertWishlistIsEmpty" method="test">
45+
<data name="products" xsi:type="string">groupedProduct::three_simple_products</data>
46+
<data name="removedProductsIndex" xsi:type="string">1</data>
47+
<constraint name="assertWishlistIsEmpty"/>
48+
</variation>
49+
</testCase>
5050
</config>

0 commit comments

Comments
 (0)