Skip to content

Commit 78bb169

Browse files
authored
Merge pull request #5424 from magento-pangolin/MQE-1993
[pangolin] Refactor MFTF tests/actionGroups using <executeInSelenium>
2 parents 0fff8fc + bd0df9a commit 78bb169

File tree

33 files changed

+285
-350
lines changed

33 files changed

+285
-350
lines changed

app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminDeleteAllProductCustomOptionsActionGroup.xml

Lines changed: 0 additions & 26 deletions
This file was deleted.

app/code/Magento/Catalog/Test/Mftf/ActionGroup/DeleteDefaultCategoryChildrenActionGroup.xml

Lines changed: 0 additions & 35 deletions
This file was deleted.

app/code/Magento/Catalog/Test/Mftf/Data/CategoryData.xml

Lines changed: 116 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,4 +127,120 @@
127127
<entity name="SubCategoryNonAnchor" extends="SubCategoryWithParent">
128128
<requiredEntity type="custom_attribute">CustomAttributeCategoryNonAnchor</requiredEntity>
129129
</entity>
130+
<entity name="ApiCategoryA" type="category">
131+
<data key="name" unique="suffix">Category A</data>
132+
<data key="is_active">true</data>
133+
</entity>
134+
<entity name="ApiCategoryTest" type="category">
135+
<data key="name" unique="suffix">TEST</data>
136+
<data key="is_active">true</data>
137+
</entity>
138+
<entity name="ApiCategoryTest2" type="category">
139+
<data key="name" unique="suffix">_test2</data>
140+
<data key="is_active">true</data>
141+
</entity>
142+
<entity name="ApiCategoryTest3" type="category">
143+
<data key="name" unique="suffix">test 3</data>
144+
<data key="is_active">true</data>
145+
</entity>
146+
<entity name="ApiCategorySeveralProducts" type="category">
147+
<data key="name" unique="suffix">Category with several products</data>
148+
<data key="is_active">true</data>
149+
</entity>
150+
<entity name="ApiCategoryTest4" type="category">
151+
<data key="name" unique="suffix">test 4</data>
152+
<data key="is_active">true</data>
153+
</entity>
154+
<entity name="ApiCategoryTest5" type="category">
155+
<data key="name" unique="suffix">test 5</data>
156+
<data key="is_active">true</data>
157+
</entity>
158+
<entity name="ApiCategoryTest8" type="category">
159+
<data key="name" unique="suffix">test 8</data>
160+
<data key="is_active">true</data>
161+
</entity>
162+
<entity name="ApiCategoryTest6" type="category">
163+
<data key="name" unique="suffix">test 6</data>
164+
<data key="is_active">true</data>
165+
</entity>
166+
<entity name="ApiCategoryTest7" type="category">
167+
<data key="name" unique="suffix">test 7</data>
168+
<data key="is_active">true</data>
169+
</entity>
170+
<entity name="ApiCategoryLongTitle" type="category">
171+
<data key="name" unique="suffix">This is a very very very very very looong title</data>
172+
<data key="is_active">true</data>
173+
</entity>
174+
<entity name="ApiCategoryWithImage" type="category">
175+
<data key="name" unique="suffix">Category with image</data>
176+
<data key="is_active">true</data>
177+
</entity>
178+
<entity name="ApiCategoryTest0" type="category">
179+
<data key="name" unique="suffix">test 0</data>
180+
<data key="is_active">true</data>
181+
</entity>
182+
<entity name="ApiCategoryWithDescription" type="category">
183+
<data key="name" unique="suffix">Category with description &amp; custom title</data>
184+
<data key="is_active">true</data>
185+
</entity>
186+
<entity name="ApiCategoryWithChildren" type="category">
187+
<data key="name" unique="suffix">Category with children</data>
188+
<data key="is_active">true</data>
189+
</entity>
190+
<entity name="ApiSubCategoryWithParentLongName" type="category">
191+
<data key="name" unique="suffix">level 1 test category very very very long name</data>
192+
<data key="name_lwr" unique="suffix">level 1 test category very very very long name</data>
193+
<data key="is_active">true</data>
194+
<data key="include_in_menu">true</data>
195+
<var key="parent_id" entityType="category" entityKey="id"/>
196+
</entity>
197+
<entity name="ApiSubCategoryWithParentLevel1" type="category">
198+
<data key="name" unique="suffix">level 1 test category name</data>
199+
<data key="name_lwr" unique="suffix">level 1 test category name</data>
200+
<data key="is_active">true</data>
201+
<data key="include_in_menu">true</data>
202+
<var key="parent_id" entityType="category" entityKey="id"/>
203+
</entity>
204+
<entity name="ApiSubCategoryWithChildrenLevel1" type="category">
205+
<data key="name" unique="suffix">level 1 with children</data>
206+
<data key="name_lwr" unique="suffix">level 1 with children</data>
207+
<data key="is_active">true</data>
208+
<data key="include_in_menu">true</data>
209+
<var key="parent_id" entityType="category" entityKey="id"/>
210+
</entity>
211+
<entity name="ApiSubCategoryWithChildrenLevel2" type="category">
212+
<data key="name" unique="suffix">level 2 with children</data>
213+
<data key="name_lwr" unique="suffix">level 2 with children</data>
214+
<data key="is_active">true</data>
215+
<data key="include_in_menu">true</data>
216+
<var key="parent_id" entityType="category" entityKey="id"/>
217+
</entity>
218+
<entity name="ApiSubCategoryLevel3" type="category">
219+
<data key="name" unique="suffix">level 3 test</data>
220+
<data key="name_lwr" unique="suffix">level 3 test</data>
221+
<data key="is_active">true</data>
222+
<data key="include_in_menu">true</data>
223+
<var key="parent_id" entityType="category" entityKey="id"/>
224+
</entity>
225+
<entity name="ApiSubCategoryLevel4" type="category">
226+
<data key="name" unique="suffix">level 4</data>
227+
<data key="name_lwr" unique="suffix">level 4</data>
228+
<data key="is_active">true</data>
229+
<data key="include_in_menu">true</data>
230+
<var key="parent_id" entityType="category" entityKey="id"/>
231+
</entity>
232+
<entity name="ApiSubCategoryLevel4Test" type="category">
233+
<data key="name" unique="suffix">level 4 test</data>
234+
<data key="name_lwr" unique="suffix">level 4 test</data>
235+
<data key="is_active">true</data>
236+
<data key="include_in_menu">true</data>
237+
<var key="parent_id" entityType="category" entityKey="id"/>
238+
</entity>
239+
<entity name="ApiSubCategoryLevel5" type="category">
240+
<data key="name" unique="suffix">level 5</data>
241+
<data key="name_lwr" unique="suffix">level 5</data>
242+
<data key="is_active">true</data>
243+
<data key="include_in_menu">true</data>
244+
<var key="parent_id" entityType="category" entityKey="id"/>
245+
</entity>
130246
</entities>

app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveCustomOptionsFromProductTest.xml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,15 @@
8484
<argument name="option" value="ProductOptionFieldSecond"/>
8585
</actionGroup>
8686
<!-- Delete All options and See no more options present on the page -->
87-
<actionGroup ref="AdminDeleteAllProductCustomOptionsActionGroup" stepKey="deleteAllCustomOptions"/>
87+
<actionGroup ref="AdminDeleteProductCustomOptionActionGroup" stepKey="deleteCustomOptionField">
88+
<argument name="option" value="ProductOptionField"/>
89+
</actionGroup>
90+
<actionGroup ref="AdminDeleteProductCustomOptionActionGroup" stepKey="deleteCustomOptionFile2">
91+
<argument name="option" value="ProductOptionFileSecond"/>
92+
</actionGroup>
93+
<actionGroup ref="AdminDeleteProductCustomOptionActionGroup" stepKey="deleteCustomOptionFieldSecond">
94+
<argument name="option" value="ProductOptionFieldSecond"/>
95+
</actionGroup>
8896
<!-- Product successfully saved and it has no options -->
8997
<actionGroup ref="SaveProductFormActionGroup" stepKey="saveProductWithoutCustomOptions"/>
9098
<actionGroup ref="AdminAssertProductHasNoCustomOptionsActionGroup" stepKey="assertNoCustomOptions"/>

0 commit comments

Comments
 (0)