Skip to content

Commit 7fc27af

Browse files
author
olysenko
committed
MAGETWO-89382: Automate MAGETWO-46344 MFTF
1 parent 9287053 commit 7fc27af

File tree

8 files changed

+21
-30
lines changed

8 files changed

+21
-30
lines changed

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/CategoryData.xml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
<data key="name_lwr" unique="suffix">simplesubcategory</data>
2323
<data key="is_active">true</data>
2424
<data key="include_in_menu">true</data>
25-
<var key="parent_id" entityType="category" entityKey="id"/>
2625
</entity>
2726
<entity name="NewRootCategory" type="category">
2827
<data key="name" unique="suffix">NewRootCategory</data>
@@ -31,4 +30,10 @@
3130
<data key="include_in_menu">true</data>
3231
<data key="parent_id">1</data>
3332
</entity>
33+
<entity name="SubCategoryWithParent" type="category">
34+
<data key="name" unique="suffix">subCategory</data>
35+
<data key="name_lwr" unique="suffix">subCategory</data>
36+
<data key="is_active">true</data>
37+
<var key="parent_id" entityType="category" entityKey="id" />
38+
</entity>
3439
</entities>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/DeleteCategoriesTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<createData entity="productWithDescription" stepKey="createProduct1">
2424
<requiredEntity createDataKey="createCategoryC"/>
2525
</createData>
26-
<createData entity="SimpleSubCategory" stepKey="createSubCategory">
26+
<createData entity="SubCategoryWithParent" stepKey="createSubCategory">
2727
<requiredEntity createDataKey="createCategoryC"/>
2828
</createData>
2929
<createData entity="productWithDescription" stepKey="createProduct2">

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/EndToEndB2CGuestUserTest.xml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,7 @@
6868
<click selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="browseClickCategory"/>
6969
<actionGroup ref="StorefrontCheckCategoryActionGroup" stepKey="browseAssertCategory">
7070
<argument name="category" value="$$createCategory$$"/>
71-
<!-- @TODO: Change to scalar value after MQE-498 is implemented -->
72-
<argument name="productCount" value="CONST.three"/>
71+
<argument name="productCount" value="3"/>
7372
</actionGroup>
7473
<!-- Check simple product 1 in category -->
7574
<comment userInput="Check simple product 1 in category" stepKey="commentCheckSimpleProductInCategory" />
@@ -120,8 +119,7 @@
120119
<waitForLoadingMaskToDisappear stepKey="waitForCategoryloaded" />
121120
<actionGroup ref="StorefrontCheckCategoryActionGroup" stepKey="compareAssertCategory">
122121
<argument name="category" value="$$createCategory$$"/>
123-
<!-- @TODO: Change to scalar value after MQE-498 is implemented -->
124-
<argument name="productCount" value="CONST.three"/>
122+
<argument name="productCount" value="3"/>
125123
</actionGroup>
126124
<actionGroup ref="StorefrontCheckCategorySimpleProduct" stepKey="compareAssertSimpleProduct1">
127125
<argument name="product" value="$$createSimpleProduct1$$"/>
@@ -147,8 +145,7 @@
147145
<waitForLoadingMaskToDisappear stepKey="waitForCompareCategory1loaded" />
148146
<actionGroup ref="StorefrontCheckCategoryActionGroup" stepKey="compareAssertCategory1">
149147
<argument name="category" value="$$createCategory$$"/>
150-
<!-- @TODO: Change to scalar value after MQE-498 is implemented -->
151-
<argument name="productCount" value="CONST.three"/>
148+
<argument name="productCount" value="3"/>
152149
</actionGroup>
153150
<actionGroup ref="StorefrontCheckCategorySimpleProduct" stepKey="compareAssertSimpleProduct2">
154151
<argument name="product" value="$$createSimpleProduct2$$"/>
@@ -196,8 +193,7 @@
196193
<click selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="compareClickCategoryBeforeClear" after="commentClearComparisonSidebar"/>
197194
<actionGroup ref="StorefrontCheckCategoryActionGroup" stepKey="compareAssertCategory2">
198195
<argument name="category" value="$$createCategory$$"/>
199-
<!-- @TODO: Change to scalar value after MQE-498 is implemented -->
200-
<argument name="productCount" value="CONST.three"/>
196+
<argument name="productCount" value="3"/>
201197
</actionGroup>
202198
<actionGroup ref="StorefrontClearCompareActionGroup" stepKey="compareClearCompare"/>
203199
<comment userInput="End of Comparing Products" stepKey="endOfComparingProducts" />

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/EndToEndB2CLoggedInUserTest.xml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,7 @@
5757
<click selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="browseClickCategory" after="commentOpenCategory"/>
5858
<actionGroup ref="StorefrontCheckCategoryActionGroup" stepKey="browseAssertCategory" after="browseClickCategory">
5959
<argument name="category" value="$$createCategory$$"/>
60-
<!-- @TODO: Change to scalar value after MQE-498 is implemented -->
61-
<argument name="productCount" value="CONST.three"/>
60+
<argument name="productCount" value="3"/>
6261
</actionGroup>
6362
<!-- Check simple product 1 in category -->
6463
<comment userInput="Check simple product 1 in category" stepKey="commentCheckSimpleProductInCategory" after="browseAssertCategory"/>
@@ -109,8 +108,7 @@
109108
<waitForLoadingMaskToDisappear stepKey="waitForCategoryloaded" after="compareClickCategory"/>
110109
<actionGroup ref="StorefrontCheckCategoryActionGroup" stepKey="compareAssertCategory" after="waitForCategoryloaded">
111110
<argument name="category" value="$$createCategory$$"/>
112-
<!-- @TODO: Change to scalar value after MQE-498 is implemented -->
113-
<argument name="productCount" value="CONST.three"/>
111+
<argument name="productCount" value="3"/>
114112
</actionGroup>
115113
<actionGroup ref="StorefrontCheckCategorySimpleProduct" stepKey="compareAssertSimpleProduct1" after="compareAssertCategory">
116114
<argument name="product" value="$$createSimpleProduct1$$"/>
@@ -136,8 +134,7 @@
136134
<waitForLoadingMaskToDisappear stepKey="waitForCompareCategory1loaded" after="compareClickCategory1"/>
137135
<actionGroup ref="StorefrontCheckCategoryActionGroup" stepKey="compareAssertCategory1" after="waitForCompareCategory1loaded">
138136
<argument name="category" value="$$createCategory$$"/>
139-
<!-- @TODO: Change to scalar value after MQE-498 is implemented -->
140-
<argument name="productCount" value="CONST.three"/>
137+
<argument name="productCount" value="3"/>
141138
</actionGroup>
142139
<actionGroup ref="StorefrontCheckCategorySimpleProduct" stepKey="compareAssertSimpleProduct2" after="compareAssertCategory1">
143140
<argument name="product" value="$$createSimpleProduct2$$"/>
@@ -183,8 +180,7 @@
183180
<click selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="compareClickCategoryBeforeClear" after="commentClearComparisonSidebar"/>
184181
<actionGroup ref="StorefrontCheckCategoryActionGroup" stepKey="compareAssertCategory2" after="compareClickCategoryBeforeClear">
185182
<argument name="category" value="$$createCategory$$"/>
186-
<!-- @TODO: Change to scalar value after MQE-498 is implemented -->
187-
<argument name="productCount" value="CONST.three"/>
183+
<argument name="productCount" value="3"/>
188184
</actionGroup>
189185
<actionGroup ref="StorefrontClearCompareActionGroup" stepKey="compareClearCompare" after="compareAssertCategory2"/>
190186
<comment userInput="End of Comparing Products" stepKey="endOfComparingProducts" after="compareClearCompare"/>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Test/EndToEndB2CGuestUserTest.xml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@
1717
<waitForLoadingMaskToDisappear stepKey="waitForCartCategoryloaded" after="cartClickCategory"/>
1818
<actionGroup ref="StorefrontCheckCategoryActionGroup" stepKey="cartAssertCategory" after="waitForCartCategoryloaded">
1919
<argument name="category" value="$$createCategory$$"/>
20-
<!-- @TODO: Change to scalar value after MQE-498 is implemented -->
21-
<argument name="productCount" value="CONST.three"/>
20+
<argument name="productCount" value="3"/>
2221
</actionGroup>
2322
<actionGroup ref="StorefrontCheckCategorySimpleProduct" stepKey="cartAssertSimpleProduct1" after="cartAssertCategory">
2423
<argument name="product" value="$$createSimpleProduct1$$"/>
@@ -46,8 +45,7 @@
4645
<waitForLoadingMaskToDisappear stepKey="waitForCartCategory1loaded" after="cartClickCategory1"/>
4746
<actionGroup ref="StorefrontCheckCategoryActionGroup" stepKey="cartAssertCategory1ForSimpleProduct2" after="waitForCartCategory1loaded">
4847
<argument name="category" value="$$createCategory$$"/>
49-
<!-- @TODO: Change to scalar value after MQE-498 is implemented -->
50-
<argument name="productCount" value="CONST.three"/>
48+
<argument name="productCount" value="3"/>
5149
</actionGroup>
5250
<actionGroup ref="StorefrontCheckCategorySimpleProduct" stepKey="cartAssertSimpleProduct2" after="cartAssertCategory1ForSimpleProduct2">
5351
<argument name="product" value="$$createSimpleProduct2$$"/>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Test/EndToEndB2CLoggedInUserTest.xml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@
1717
<waitForLoadingMaskToDisappear stepKey="waitForCartCategoryloaded" after="cartClickCategory"/>
1818
<actionGroup ref="StorefrontCheckCategoryActionGroup" stepKey="cartAssertCategory" after="waitForCartCategoryloaded">
1919
<argument name="category" value="$$createCategory$$"/>
20-
<!-- @TODO: Change to scalar value after MQE-498 is implemented -->
21-
<argument name="productCount" value="CONST.three"/>
20+
<argument name="productCount" value="3"/>
2221
</actionGroup>
2322
<actionGroup ref="StorefrontCheckCategorySimpleProduct" stepKey="cartAssertSimpleProduct1" after="cartAssertCategory">
2423
<argument name="product" value="$$createSimpleProduct1$$"/>
@@ -46,8 +45,7 @@
4645
<waitForLoadingMaskToDisappear stepKey="waitForCartCategory1loaded" after="cartClickCategory1"/>
4746
<actionGroup ref="StorefrontCheckCategoryActionGroup" stepKey="cartAssertCategory1ForSimpleProduct2" after="waitForCartCategory1loaded">
4847
<argument name="category" value="$$createCategory$$"/>
49-
<!-- @TODO: Change to scalar value after MQE-498 is implemented -->
50-
<argument name="productCount" value="CONST.three"/>
48+
<argument name="productCount" value="3"/>
5149
</actionGroup>
5250
<actionGroup ref="StorefrontCheckCategorySimpleProduct" stepKey="cartAssertSimpleProduct2" after="cartAssertCategory1ForSimpleProduct2">
5351
<argument name="product" value="$$createSimpleProduct2$$"/>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/EndToEndB2CGuestUserTest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,7 @@
112112
<waitForLoadingMaskToDisappear stepKey="waitForCartCategory2loaded" after="cartClickCategory2"/>
113113
<actionGroup ref="StorefrontCheckCategoryActionGroup" stepKey="cartAssertCategory1ForConfigurableProduct" after="waitForCartCategory2loaded">
114114
<argument name="category" value="$$createCategory$$"/>
115-
<!-- @TODO: Change to scalar value after MQE-498 is implemented -->
116-
<argument name="productCount" value="CONST.three"/>
115+
<argument name="productCount" value="3"/>
117116
</actionGroup>
118117
<actionGroup ref="StorefrontCheckCategoryConfigurableProduct" stepKey="cartAssertConfigProduct" after="cartAssertCategory1ForConfigurableProduct">
119118
<argument name="product" value="$$createConfigProduct$$"/>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/EndToEndB2CLoggedInUserTest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,7 @@
112112
<waitForLoadingMaskToDisappear stepKey="waitForCartCategory2loaded" after="cartClickCategory2"/>
113113
<actionGroup ref="StorefrontCheckCategoryActionGroup" stepKey="cartAssertCategory1ForConfigurableProduct" after="waitForCartCategory2loaded">
114114
<argument name="category" value="$$createCategory$$"/>
115-
<!-- @TODO: Change to scalar value after MQE-498 is implemented -->
116-
<argument name="productCount" value="CONST.three"/>
115+
<argument name="productCount" value="3"/>
117116
</actionGroup>
118117
<actionGroup ref="StorefrontCheckCategoryConfigurableProduct" stepKey="cartAssertConfigProduct" after="cartAssertCategory1ForConfigurableProduct">
119118
<argument name="product" value="$$createConfigProduct$$"/>

0 commit comments

Comments
 (0)