Skip to content

Commit 8b335c5

Browse files
author
Dmytro Voskoboinikov
committed
Merge branch 'MAGETWO-30884' of https://github.corp.ebay.com/magento-firedrakes/magento2ce into MAGETWO-30884
2 parents 33480a2 + b4b7cdd commit 8b335c5

File tree

121 files changed

+6236
-5288
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

121 files changed

+6236
-5288
lines changed

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

Lines changed: 516 additions & 465 deletions
Large diffs are not rendered by default.

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

Lines changed: 50 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -5,39 +5,54 @@
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="UpdateBundleProductEntityTest">
10-
<variation name="UpdateBundleProductEntityTestVariation1">
11-
<data name="originalProduct/dataSet">bundle_dynamic_product</data>
12-
<data name="product/data/name">bundle_dynamic_%isolation%</data>
13-
<data name="product/data/sku_type">Fixed</data>
14-
<data name="product/data/sku">bundle_dynamic_%isolation%</data>
15-
<data name="product/data/price/preset">dynamic-100</data>
16-
<data name="product/data/weight_type">Fixed</data>
17-
<data name="product/data/weight">1</data>
18-
<data name="product/data/category_ids/presets">-</data>
19-
<data name="product/data/description">Bundle Product Fixed Required</data>
20-
<data name="product/data/bundle_shipment_type">Together</data>
21-
<data name="product/data/bundle_selections/preset">default_dynamic</data>
22-
<data name="product/data/checkout_data/preset">default</data>
23-
<data name="product/data/visibility">-</data>
24-
<data name="constraint">assertProductSaveMessage, assertProductInGrid, assertBundleItemsOnProductPage, assertBundleProductForm, assertBundleProductPage, assertProductInStock, assertBundlePriceView, assertBundlePriceType</data>
25-
</variation>
26-
<variation name="UpdateBundleProductEntityTestVariation2">
27-
<data name="originalProduct/dataSet">bundle_fixed_product</data>
28-
<data name="product/data/name">bundle_dynamic_%isolation%</data>
29-
<data name="product/data/sku_type">Dynamic</data>
30-
<data name="product/data/sku">bundle_sku_%isolation%</data>
31-
<data name="product/data/price/preset">fixed-756</data>
32-
<data name="product/data/weight_type">Dynamic</data>
33-
<data name="product/data/weight">-</data>
34-
<data name="product/data/category_ids/presets">default_subcategory</data>
35-
<data name="product/data/description">-</data>
36-
<data name="product/data/bundle_shipment_type">Separately</data>
37-
<data name="product/data/bundle_selections/preset">default_fixed</data>
38-
<data name="product/data/checkout_data/preset">default</data>
39-
<data name="product/data/visibility">Catalog, Search</data>
40-
<data name="constraint">assertProductSaveMessage, assertProductInGrid, assertBundleItemsOnProductPage, assertBundleProductForm, assertBundleProductPage, assertProductInStock, assertProductVisibleInCategory, assertBundlePriceView, assertBundlePriceType</data>
41-
</variation>
42-
</testCase>
8+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/global/variations.xsd">
9+
<testCase name="UpdateBundleProductEntityTest">
10+
<variation name="UpdateBundleProductEntityTestVariation1" firstConstraint="assertProductSaveMessage" method="test">
11+
<data name="originalProduct/dataSet">bundle_dynamic_product</data>
12+
<data name="product/data/name">bundle_dynamic_%isolation%</data>
13+
<data name="product/data/sku_type">Fixed</data>
14+
<data name="product/data/sku">bundle_dynamic_%isolation%</data>
15+
<data name="product/data/price/preset">dynamic-100</data>
16+
<data name="product/data/weight_type">Fixed</data>
17+
<data name="product/data/weight">1</data>
18+
<data name="product/data/category_ids/presets">-</data>
19+
<data name="product/data/description">Bundle Product Fixed Required</data>
20+
<data name="product/data/bundle_shipment_type">Together</data>
21+
<data name="product/data/bundle_selections/preset">default_dynamic</data>
22+
<data name="product/data/checkout_data/preset">default</data>
23+
<data name="product/data/visibility">-</data>
24+
<constraint name="assertProductSaveMessage" next="assertProductInGrid"/>
25+
<constraint name="assertProductInGrid" next="assertBundleItemsOnProductPage" prev="assertProductSaveMessage"/>
26+
<constraint name="assertBundleItemsOnProductPage" next="assertBundleProductForm" prev="assertProductInGrid"/>
27+
<constraint name="assertBundleProductForm" next="assertBundleProductPage" prev="assertBundleItemsOnProductPage"/>
28+
<constraint name="assertBundleProductPage" next="assertProductInStock" prev="assertBundleProductForm"/>
29+
<constraint name="assertProductInStock" next="assertBundlePriceView" prev="assertBundleProductPage"/>
30+
<constraint name="assertBundlePriceView" next="assertBundlePriceType" prev="assertProductInStock"/>
31+
<constraint name="assertBundlePriceType" prev="assertBundlePriceView"/>
32+
</variation>
33+
<variation name="UpdateBundleProductEntityTestVariation2" firstConstraint="assertProductSaveMessage" method="test">
34+
<data name="originalProduct/dataSet">bundle_fixed_product</data>
35+
<data name="product/data/name">bundle_dynamic_%isolation%</data>
36+
<data name="product/data/sku_type">Dynamic</data>
37+
<data name="product/data/sku">bundle_sku_%isolation%</data>
38+
<data name="product/data/price/preset">fixed-756</data>
39+
<data name="product/data/weight_type">Dynamic</data>
40+
<data name="product/data/weight">-</data>
41+
<data name="product/data/category_ids/presets">default_subcategory</data>
42+
<data name="product/data/description">-</data>
43+
<data name="product/data/bundle_shipment_type">Separately</data>
44+
<data name="product/data/bundle_selections/preset">default_fixed</data>
45+
<data name="product/data/checkout_data/preset">default</data>
46+
<data name="product/data/visibility">Catalog, Search</data>
47+
<constraint name="assertProductSaveMessage" next="assertProductInGrid"/>
48+
<constraint name="assertProductInGrid" next="assertBundleItemsOnProductPage" prev="assertProductSaveMessage"/>
49+
<constraint name="assertBundleItemsOnProductPage" next="assertBundleProductForm" prev="assertProductInGrid"/>
50+
<constraint name="assertBundleProductForm" next="assertBundleProductPage" prev="assertBundleItemsOnProductPage"/>
51+
<constraint name="assertBundleProductPage" next="assertProductInStock" prev="assertBundleProductForm"/>
52+
<constraint name="assertProductInStock" next="assertProductVisibleInCategory" prev="assertBundleProductPage"/>
53+
<constraint name="assertProductVisibleInCategory" next="assertBundlePriceView" prev="assertProductInStock"/>
54+
<constraint name="assertBundlePriceView" next="assertBundlePriceType" prev="assertProductVisibleInCategory"/>
55+
<constraint name="assertBundlePriceType" prev="assertBundlePriceView"/>
56+
</variation>
57+
</testCase>
4358
</config>

0 commit comments

Comments
 (0)