Skip to content

Commit 7321d7b

Browse files
VladimirZaetsVladimirZaets
authored
ENGCOM-6419: MFTF: Extract Action Groups to separate files - magento/module-grouped-product #25821 
2 parents 903c46f + 2aba98e commit 7321d7b

15 files changed

+153
-22
lines changed

‎app/code/Magento/GroupedProduct/Test/Mftf/ActionGroup/AdminAssignProductToGroupActionGroup.xml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AdminAssignProductToGroupActionGroup">
12+
<annotations>
13+
<description>Adds the provided Product to a Grouped Product on an Admin Grouped Product creation/edit page.</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="product"/>
17+
</arguments>
18+
19+
<scrollTo selector="{{AdminProductFormGroupedProductsSection.toggleGroupedProduct}}" x="0" y="-100" stepKey="scrollToGroupedSection"/>
20+
<conditionalClick selector="{{AdminProductFormGroupedProductsSection.toggleGroupedProduct}}" dependentSelector="{{AdminProductFormGroupedProductsSection.addProductsToGroup}}" visible="false" stepKey="openGroupedProductsSection"/>
21+
<click selector="{{AdminProductFormGroupedProductsSection.addProductsToGroup}}" stepKey="clickAddProductsToGroup"/>
22+
<conditionalClick selector="{{AdminAddProductsToGroupPanel.clearFilters}}" dependentSelector="{{AdminAddProductsToGroupPanel.clearFilters}}" visible="true" stepKey="clearExistingFilters"/>
23+
<click selector="{{AdminAddProductsToGroupPanel.filters}}" stepKey="showFiltersPanel"/>
24+
<fillField userInput="{{product.name}}" selector="{{AdminAddProductsToGroupPanel.nameFilter}}" stepKey="fillNameFilter"/>
25+
<click selector="{{AdminAddProductsToGroupPanel.applyFilters}}" stepKey="clickApplyFilters"/>
26+
<click selector="{{AdminAddProductsToGroupPanel.firstCheckbox}}" stepKey="selectProduct"/>
27+
<click selector="{{AdminAddProductsToGroupPanel.addSelectedProducts}}" stepKey="clickAddSelectedGroupProducts"/>
28+
</actionGroup>
29+
</actionGroups>

‎app/code/Magento/GroupedProduct/Test/Mftf/ActionGroup/CheckRequiredFieldsInGroupedProductFormActionGroup.xml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<!--Check that required fields are actually required-->
12+
<actionGroup name="CheckRequiredFieldsInGroupedProductFormActionGroup">
13+
<annotations>
14+
<description>Clears the Product Name and SKU fields when adding a Grouped Product and then verifies that they are required after attempting to Save.</description>
15+
</annotations>
16+
17+
<clearField selector="{{AdminProductFormSection.productName}}" stepKey="clearProductSku"/>
18+
<clearField selector="{{AdminProductFormSection.productSku}}" stepKey="clearProductName"/>
19+
<click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton"/>
20+
<see selector="{{AdminHeaderSection.pageTitle}}" userInput="New Product" stepKey="seeStillOnEditPage"/>
21+
<see selector="{{AdminProductFormSection.fieldError('name')}}" userInput="This is a required field." stepKey="seeNameRequired"/>
22+
<see selector="{{AdminProductFormSection.fieldError('sku')}}" userInput="This is a required field." stepKey="seeSkuRequired"/>
23+
</actionGroup>
24+
</actionGroups>

‎app/code/Magento/GroupedProduct/Test/Mftf/ActionGroup/FillDefaultQuantityForLinkedToGroupProductInGridActionGroup.xml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="FillDefaultQuantityForLinkedToGroupProductInGridActionGroup">
12+
<annotations>
13+
<description>Fills the provided Qty for a Product linked to a Grouped Product.</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="productName" type="string"/>
17+
<argument name="qty" type="string"/>
18+
</arguments>
19+
20+
<fillField selector="{{AdminAddedProductsToGroupGrid.inputByProductName(productName)}}" userInput="{{qty}}" stepKey="fillDefaultQtyForLinkedProduct"/>
21+
</actionGroup>
22+
</actionGroups>

‎app/code/Magento/GroupedProduct/Test/Mftf/ActionGroup/FillGroupedProductFormActionGroup.xml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="FillGroupedProductFormActionGroup">
12+
<annotations>
13+
<description>Fills in the provided Product Name and SKU on the Grouped Product creation/edit page.</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="product" defaultValue="GroupedProduct"/>
17+
</arguments>
18+
19+
<fillField selector="{{AdminProductFormSection.productName}}" userInput="{{product.name}}" stepKey="fillProductSku"/>
20+
<fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{product.sku}}" stepKey="fillProductName"/>
21+
</actionGroup>
22+
</actionGroups>

‎app/code/Magento/GroupedProduct/Test/Mftf/ActionGroup/ViewGroupedProductInAdminGridActionGroup.xml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="ViewGroupedProductInAdminGridActionGroup">
12+
<annotations>
13+
<description>Goes to the Admin Products grid page. Filters the grid for the provided Product. Validates that the provided Product appears in the grid.</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="product" defaultValue="GroupedProduct"/>
17+
</arguments>
18+
19+
<amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPage"/>
20+
<waitForPageLoad stepKey="waitForPageLoadInitial"/>
21+
<conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFiltersInitial"/>
22+
<click selector="{{AdminProductGridFilterSection.filters}}" stepKey="openProductFilters"/>
23+
<fillField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{product.name}}" stepKey="fillProductNameFilter"/>
24+
<fillField selector="{{AdminProductGridFilterSection.skuFilter}}" userInput="{{product.sku}}" stepKey="fillProductSkuFilter"/>
25+
<selectOption selector="{{AdminProductGridFilterSection.typeFilter}}" userInput="{{product.type_id}}" stepKey="selectionProductType"/>
26+
<click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFilters"/>
27+
<see selector="{{AdminProductGridSection.firstProductRow}}" userInput="{{product.name}}" stepKey="seeProductNameInGrid"/>
28+
<click selector="{{AdminProductGridFilterSection.clearFilters}}" stepKey="clickClearFiltersAfter"/>
29+
</actionGroup>
30+
</actionGroups>

‎app/code/Magento/GroupedProduct/Test/Mftf/ActionGroup/AdminGroupedProductActionGroup.xml renamed to ‎app/code/Magento/GroupedProduct/Test/Mftf/ActionGroup/_Deprecated_ActionGroup.xml

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,18 @@
66
*/
77
-->
88

9+
<!--
10+
NOTICE: Action Groups in this file are DEPRECATED and SHOULD NOT BE USED anymore.
11+
Please find the Comment with proper replacement for each of ActionGroups provided.
12+
-->
913
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1014
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11-
<!--Check that required fields are actually required-->
1215
<actionGroup name="checkRequiredFieldsInGroupedProductForm">
1316
<annotations>
1417
<description>Clears the Product Name and SKU fields when adding a Grouped Product and then verifies that they are required after attempting to Save.</description>
1518
</annotations>
16-
19+
20+
<!-- NOTICE: This ActionGroup is DEPRECATED! Use `CheckRequiredFieldsInGroupedProductFormActionGroup` instead -->
1721
<clearField selector="{{AdminProductFormSection.productName}}" stepKey="clearProductSku"/>
1822
<clearField selector="{{AdminProductFormSection.productSku}}" stepKey="clearProductName"/>
1923
<click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton"/>
@@ -30,20 +34,21 @@
3034
<arguments>
3135
<argument name="product" defaultValue="GroupedProduct"/>
3236
</arguments>
33-
37+
38+
<!-- NOTICE: This ActionGroup is DEPRECATED! Use `FillGroupedProductFormActionGroup` instead -->
3439
<fillField selector="{{AdminProductFormSection.productName}}" userInput="{{product.name}}" stepKey="fillProductSku"/>
3540
<fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{product.sku}}" stepKey="fillProductName"/>
3641
</actionGroup>
3742

38-
<!--Filter product grid and see expected grouped product-->
3943
<actionGroup name="viewGroupedProductInAdminGrid">
4044
<annotations>
4145
<description>Goes to the Admin Products grid page. Filters the grid for the provided Product. Validates that the provided Product appears in the grid.</description>
4246
</annotations>
4347
<arguments>
4448
<argument name="product" defaultValue="GroupedProduct"/>
4549
</arguments>
46-
50+
51+
<!-- NOTICE: This ActionGroup is DEPRECATED! Use `ViewGroupedProductInAdminGridActionGroup` instead -->
4752
<amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPage"/>
4853
<waitForPageLoad stepKey="waitForPageLoadInitial"/>
4954
<conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFiltersInitial"/>
@@ -56,7 +61,6 @@
5661
<click selector="{{AdminProductGridFilterSection.clearFilters}}" stepKey="clickClearFiltersAfter"/>
5762
</actionGroup>
5863

59-
<!--Fill product min quantity in group products grid-->
6064
<actionGroup name="fillDefaultQuantityForLinkedToGroupProductInGrid">
6165
<annotations>
6266
<description>Fills the provided Qty for a Product linked to a Grouped Product.</description>
@@ -65,12 +69,11 @@
6569
<argument name="productName" type="string"/>
6670
<argument name="qty" type="string"/>
6771
</arguments>
68-
72+
73+
<!-- NOTICE: This ActionGroup is DEPRECATED! Use `FillDefaultQuantityForLinkedToGroupProductInGridActionGroup` instead -->
6974
<fillField selector="{{AdminAddedProductsToGroupGrid.inputByProductName(productName)}}" userInput="{{qty}}" stepKey="fillDefaultQtyForLinkedProduct"/>
7075
</actionGroup>
7176

72-
<!-- Assign Specified Product To Grouped Product -->
73-
<!-- Assumes web client is on grouped product edit page -->
7477
<actionGroup name="AdminAssignProductToGroup">
7578
<annotations>
7679
<description>Adds the provided Product to a Grouped Product on an Admin Grouped Product creation/edit page.</description>
@@ -79,6 +82,7 @@
7982
<argument name="product"/>
8083
</arguments>
8184

85+
<!-- NOTICE: This ActionGroup is DEPRECATED! Use `AdminAssignProductToGroupActionGroup` instead -->
8286
<scrollTo selector="{{AdminProductFormGroupedProductsSection.toggleGroupedProduct}}" x="0" y="-100" stepKey="scrollToGroupedSection"/>
8387
<conditionalClick selector="{{AdminProductFormGroupedProductsSection.toggleGroupedProduct}}" dependentSelector="{{AdminProductFormGroupedProductsSection.addProductsToGroup}}" visible="false" stepKey="openGroupedProductsSection"/>
8488
<click selector="{{AdminProductFormGroupedProductsSection.addProductsToGroup}}" stepKey="clickAddProductsToGroup"/>

‎app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminAddDefaultImageGroupedProductTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<actionGroup ref="goToCreateProductPage" stepKey="goToCreateProduct">
4646
<argument name="product" value="GroupedProduct"/>
4747
</actionGroup>
48-
<actionGroup ref="fillGroupedProductForm" stepKey="fillProductForm">
48+
<actionGroup ref="FillGroupedProductFormActionGroup" stepKey="fillProductForm">
4949
<argument name="product" value="GroupedProduct"/>
5050
</actionGroup>
5151

‎app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminAddDefaultVideoGroupedProductTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<actionGroup ref="goToCreateProductPage" stepKey="goToCreateProductPage">
3333
<argument name="product" value="GroupedProduct"/>
3434
</actionGroup>
35-
<actionGroup ref="fillGroupedProductForm" stepKey="fillMainProductForm">
35+
<actionGroup ref="FillGroupedProductFormActionGroup" stepKey="fillMainProductForm">
3636
<argument name="product" value="GroupedProduct"/>
3737
</actionGroup>
3838

‎app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminCreateAndEditGroupedProductSettingsTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,12 @@
5252
</actionGroup>
5353

5454
<!-- Fill all main fields -->
55-
<actionGroup ref="fillGroupedProductForm" stepKey="fillProductForm">
55+
<actionGroup ref="FillGroupedProductFormActionGroup" stepKey="fillProductForm">
5656
<argument name="product" value="GroupedProduct"/>
5757
</actionGroup>
5858

5959
<!-- Add simple product to the Group -->
60-
<actionGroup ref="AdminAssignProductToGroup" stepKey="addFirstSimpleToGroup">
60+
<actionGroup ref="AdminAssignProductToGroupActionGroup" stepKey="addFirstSimpleToGroup">
6161
<argument name="product" value="$$createProduct$$"/>
6262
</actionGroup>
6363

‎app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminGroupedProductsListTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<actionGroup ref="goToCreateProductPage" stepKey="goToCreateProductPage">
4343
<argument name="product" value="GroupedProduct"/>
4444
</actionGroup>
45-
<actionGroup ref="fillGroupedProductForm" stepKey="fillMainProductForm">
45+
<actionGroup ref="FillGroupedProductFormActionGroup" stepKey="fillMainProductForm">
4646
<argument name="product" value="GroupedProduct"/>
4747
</actionGroup>
4848
<!-- Add two simple products to grouped product -->

‎app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminGroupedSetEditRelatedProductsTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<actionGroup ref="goToCreateProductPage" stepKey="goToCreateProduct">
3131
<argument name="product" value="GroupedProduct"/>
3232
</actionGroup>
33-
<actionGroup ref="fillGroupedProductForm" stepKey="fillProductForm">
33+
<actionGroup ref="FillGroupedProductFormActionGroup" stepKey="fillProductForm">
3434
<argument name="product" value="GroupedProduct"/>
3535
</actionGroup>
3636

‎app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminRemoveDefaultImageGroupedProductTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<actionGroup ref="goToCreateProductPage" stepKey="goToCreateProduct">
4343
<argument name="product" value="GroupedProduct"/>
4444
</actionGroup>
45-
<actionGroup ref="fillGroupedProductForm" stepKey="fillProductForm">
45+
<actionGroup ref="FillGroupedProductFormActionGroup" stepKey="fillProductForm">
4646
<argument name="product" value="GroupedProduct"/>
4747
</actionGroup>
4848

‎app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminRemoveDefaultVideoGroupedProductTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<actionGroup ref="goToCreateProductPage" stepKey="goToCreateProductPage">
3333
<argument name="product" value="GroupedProduct"/>
3434
</actionGroup>
35-
<actionGroup ref="fillGroupedProductForm" stepKey="fillMainProductForm">
35+
<actionGroup ref="FillGroupedProductFormActionGroup" stepKey="fillMainProductForm">
3636
<argument name="product" value="GroupedProduct"/>
3737
</actionGroup>
3838

‎app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminSortingAssociatedProductsTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@
133133
<actionGroup ref="goToCreateProductPage" stepKey="goToCreateProduct">
134134
<argument name="product" value="GroupedProduct"/>
135135
</actionGroup>
136-
<actionGroup ref="fillGroupedProductForm" stepKey="fillProductForm">
136+
<actionGroup ref="FillGroupedProductFormActionGroup" stepKey="fillProductForm">
137137
<argument name="product" value="GroupedProduct"/>
138138
</actionGroup>
139139

‎app/code/Magento/GroupedProduct/Test/Mftf/Test/EndToEndB2CAdminTest.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
<actionGroup ref="goToCreateProductPage" stepKey="goToCreateGroupedProduct" after="waitForProductPageLoadGrouped">
1515
<argument name="product" value="GroupedProduct"/>
1616
</actionGroup>
17-
<actionGroup ref="checkRequiredFieldsInGroupedProductForm" stepKey="checkRequiredFieldsProductGrouped" after="goToCreateGroupedProduct"/>
18-
<actionGroup ref="fillGroupedProductForm" stepKey="fillGroupedProductForm" after="checkRequiredFieldsProductGrouped">
17+
<actionGroup ref="CheckRequiredFieldsInGroupedProductFormActionGroup" stepKey="checkRequiredFieldsProductGrouped" after="goToCreateGroupedProduct"/>
18+
<actionGroup ref="FillGroupedProductFormActionGroup" stepKey="fillGroupedProductForm" after="checkRequiredFieldsProductGrouped">
1919
<argument name="product" value="GroupedProduct"/>
2020
</actionGroup>
2121
<scrollTo selector="{{AdminProductFormGroupedProductsSection.toggleGroupedProduct}}" x="0" y="-100" stepKey="scrollToGroupedSection" after="fillGroupedProductForm"/>
@@ -29,7 +29,7 @@
2929
<checkOption selector="{{AdminAddProductsToGroupPanel.firstCheckbox}}" stepKey="checkFilterResult" after="filterGroupedProductOptions"/>
3030
<click selector="{{AdminAddProductsToGroupPanel.addSelectedProducts}}" stepKey="clickAddSelectedGroupProducts" after="checkFilterResult"/>
3131
<actionGroup ref="saveProductForm" stepKey="saveGroupedProduct" after="clickAddSelectedGroupProducts"/>
32-
<actionGroup ref="viewGroupedProductInAdminGrid" stepKey="viewGroupedProductInGrid" after="saveGroupedProduct">
32+
<actionGroup ref="ViewGroupedProductInAdminGridActionGroup" stepKey="viewGroupedProductInGrid" after="saveGroupedProduct">
3333
<argument name="product" value="GroupedProduct"/>
3434
</actionGroup>
3535

@@ -39,4 +39,4 @@
3939
<argument name="product" value="GroupedProduct"/>
4040
</actionGroup>
4141
</test>
42-
</tests>
42+
</tests>

0 commit comments

Comments
 (0)