Skip to content

Commit 9b28580

Browse files
ENGCOM-6405: MFTF: Extract Action Groups to separate files - magento/module-configurable-product #25830
2 parents fb1521f + c309535 commit 9b28580

File tree

89 files changed

+1700
-440
lines changed

Some content is hidden

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

89 files changed

+1700
-440
lines changed

app/code/Magento/CatalogRule/Test/Mftf/Test/AdminDeleteCatalogPriceRuleTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<!-- Login to Admin page -->
2929
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
3030
<!-- Create a configurable product -->
31-
<actionGroup ref="createConfigurableProduct" stepKey="createConfigurableProduct">
31+
<actionGroup ref="CreateConfigurableProductActionGroup" stepKey="createConfigurableProduct">
3232
<argument name="product" value="_defaultProduct"/>
3333
<argument name="category" value="$$createCategory$$"/>
3434
</actionGroup>

app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@
366366
<before>
367367
<createData entity="_defaultCategory" stepKey="createCategory"/>
368368
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
369-
<actionGroup ref="createConfigurableProduct" stepKey="createProduct">
369+
<actionGroup ref="CreateConfigurableProductActionGroup" stepKey="createProduct">
370370
<argument name="product" value="_defaultProduct"/>
371371
<argument name="category" value="$$createCategory$$"/>
372372
</actionGroup>
@@ -391,7 +391,7 @@
391391
<argument name="productName" value="{{_defaultProduct.name}}"/>
392392
<argument name="productUrlKey" value="{{_defaultProduct.urlKey}}"/>
393393
</actionGroup>
394-
<actionGroup ref="SelectSingleAttributeAndAddToCart" stepKey="addProductToCart">
394+
<actionGroup ref="SelectSingleAttributeAndAddToCartActionGroup" stepKey="addProductToCart">
395395
<argument name="productName" value="{{_defaultProduct.name}}"/>
396396
<argument name="attributeCode" value="{{colorProductAttribute.default_label}}"/>
397397
<argument name="optionName" value="{{colorProductAttribute1.name}}"/>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
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="AddNewProductConfigurationAttributeActionGroup">
12+
<annotations>
13+
<description>Generates the Product Configurations for the 2 provided Attribute Names on the Configurable Product creation/edit page.</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="attribute" type="entity"/>
17+
<argument name="firstOption" type="entity"/>
18+
<argument name="secondOption" type="entity"/>
19+
</arguments>
20+
21+
<!-- Create new attribute -->
22+
<click selector="{{AdminCreateProductConfigurationsPanel.createNewAttribute}}" stepKey="clickOnNewAttribute"/>
23+
<waitForPageLoad stepKey="waitForIFrame"/>
24+
<switchToIFrame selector="{{AdminNewAttributePanel.newAttributeIFrame}}" stepKey="switchToNewAttributeIFrame"/>
25+
<fillField selector="{{AdminNewAttributePanel.defaultLabel}}" userInput="{{attribute.default_label}}" stepKey="fillDefaultLabel"/>
26+
<click selector="{{AdminNewAttributePanel.saveAttribute}}" stepKey="clickOnNewAttributePanel"/>
27+
<waitForPageLoad stepKey="waitForSaveAttribute"/>
28+
<switchToIFrame stepKey="switchOutOfIFrame"/>
29+
<waitForPageLoad stepKey="waitForFilters"/>
30+
31+
<!-- Find created below attribute and add option; save attribute -->
32+
<click selector="{{AdminCreateProductConfigurationsPanel.filters}}" stepKey="clickOnFilters"/>
33+
<fillField userInput="{{attribute.default_label}}" selector="{{AdminCreateProductConfigurationsPanel.attributeCode}}" stepKey="fillFilterAttributeCodeField"/>
34+
<click selector="{{AdminCreateProductConfigurationsPanel.applyFilters}}" stepKey="clickApplyFiltersButton"/>
35+
<click selector="{{AdminCreateProductConfigurationsPanel.firstCheckbox}}" stepKey="clickOnFirstCheckbox"/>
36+
<click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextButton"/>
37+
<waitForElementVisible selector="{{AdminCreateProductConfigurationsPanel.createNewValue}}" stepKey="waitCreateNewValueAppears"/>
38+
<click selector="{{AdminCreateProductConfigurationsPanel.createNewValue}}" stepKey="clickOnCreateFirstNewValue"/>
39+
<fillField userInput="{{firstOption.name}}" selector="{{AdminCreateProductConfigurationsPanel.attributeName}}" stepKey="fillFieldForNewFirstOption"/>
40+
<click selector="{{AdminCreateProductConfigurationsPanel.saveAttribute}}" stepKey="clickOnSaveNewAttribute"/>
41+
<click selector="{{AdminCreateProductConfigurationsPanel.createNewValue}}" stepKey="clickOnCreateSecondNewValue"/>
42+
<fillField userInput="{{secondOption.name}}" selector="{{AdminCreateProductConfigurationsPanel.attributeName}}" stepKey="fillFieldForNewSecondOption"/>
43+
<click selector="{{AdminCreateProductConfigurationsPanel.saveAttribute}}" stepKey="clickOnSaveAttribute"/>
44+
<click selector="{{AdminCreateProductConfigurationsPanel.selectAll}}" stepKey="clickOnSelectAll"/>
45+
<click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnSecondNextButton"/>
46+
<click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnThirdNextButton"/>
47+
<click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnFourthNextButton"/>
48+
</actionGroup>
49+
</actionGroups>
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="AddProductToConfigurationsGridActionGroup">
12+
<annotations>
13+
<description>Adds the provided Product SKU to the provided Product Name.</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="sku" type="string"/>
17+
<argument name="name" type="string"/>
18+
</arguments>
19+
20+
<click selector="{{AdminProductFormConfigurationsSection.actionsBtnByProductName(name)}}" stepKey="clickToExpandFirstActions"/>
21+
<click selector="{{AdminProductFormConfigurationsSection.addProduct(name)}}" stepKey="clickChooseFirstDifferentProduct"/>
22+
<switchToIFrame stepKey="switchOutOfIFrame"/>
23+
<waitForPageLoad stepKey="waitForFilters"/>
24+
<click selector="{{AdminCreateProductConfigurationsPanel.filters}}" stepKey="clickFilters"/>
25+
<fillField selector="{{AdminProductGridFilterSection.skuFilter}}" userInput="{{sku}}" stepKey="fillProductSkuFilter"/>
26+
<click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFilters"/>
27+
<click selector="{{AdminProductGridFilterSection.firstRowBySku(sku)}}" stepKey="clickOnFirstRow"/>
28+
</actionGroup>
29+
</actionGroups>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
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="AddUniqueImageToConfigurableProductOptionActionGroup">
12+
<annotations>
13+
<description>Adds the provided Image to a Configurable Product on the Admin Product creation/edit page.</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="image" defaultValue="ProductImage"/>
17+
<argument name="frontend_label" type="string"/>
18+
<argument name="label" type="string"/>
19+
</arguments>
20+
21+
<click selector="{{AdminCreateProductConfigurationsPanel.applyUniqueImagesToEachSkus}}" stepKey="clickOnApplyUniqueImagesToEachSku"/>
22+
<selectOption userInput="{{frontend_label}}" selector="{{AdminCreateProductConfigurationsPanel.selectImagesButton}}" stepKey="selectOption"/>
23+
<attachFile selector="{{AdminCreateProductConfigurationsPanel.uploadImagesButton(label)}}" userInput="{{image.file}}" stepKey="uploadFile"/>
24+
<waitForElementNotVisible selector="{{AdminCreateProductConfigurationsPanel.uploadProgressBar}}" stepKey="waitForUpload"/>
25+
<waitForElementVisible selector="{{AdminCreateProductConfigurationsPanel.imageFile(image.fileName)}}" stepKey="waitForThumbnail"/>
26+
</actionGroup>
27+
</actionGroups>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
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="AddUniquePriceToConfigurableProductOptionActionGroup">
12+
<annotations>
13+
<description>On the 'Step 3: Bulk Images, Price and Quantity' page of the 'Create Product Configurations' model click on 'Apply unique prices...'. Select provided Option. Fill price.</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="frontend_label" type="string"/>
17+
<argument name="label" type="string"/>
18+
<argument name="price" type="string"/>
19+
</arguments>
20+
21+
<click selector="{{AdminCreateProductConfigurationsPanel.applyUniquePricesToEachSkus}}" stepKey="clickOnApplyUniquePricesToEachSku"/>
22+
<selectOption userInput="{{frontend_label}}" selector="{{AdminCreateProductConfigurationsPanel.selectPriceButton}}" stepKey="selectOption"/>
23+
<fillField selector="{{AdminCreateProductConfigurationsPanel.price(label)}}" userInput="{{price}}" stepKey="enterAttributeQuantity"/>
24+
</actionGroup>
25+
</actionGroups>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
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="AddUniqueQuantityToConfigurableProductOptionActionGroup">
12+
<arguments>
13+
<argument name="frontend_label" type="string" defaultValue="{{productAttributeColor.default_label}}"/>
14+
<argument name="label" type="string" defaultValue="option1"/>
15+
<argument name="quantity" type="string" defaultValue="10"/>
16+
</arguments>
17+
<click selector="{{AdminCreateProductConfigurationsPanel.applyUniqueQuantityToEachSkus}}" stepKey="clickOnApplyUniqueQuantitiesToEachSku"/>
18+
<selectOption selector="{{AdminCreateProductConfigurationsPanel.selectQuantity}}" userInput="{{frontend_label}}" stepKey="selectOption"/>
19+
<fillField selector="{{AdminCreateProductConfigurationsPanel.applyUniqueQuantity(label)}}" userInput="{{quantity}}" stepKey="enterAttributeQuantity"/>
20+
</actionGroup>
21+
</actionGroups>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
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="AdminConfigurableProductDisableConfigurationsActionGroup">
12+
<arguments>
13+
<argument name="productName" type="string" defaultValue="{{SimpleProduct.name}}"/>
14+
</arguments>
15+
<click selector="{{AdminProductFormConfigurationsSection.actionsBtnByProductName(productName)}}" stepKey="clickToExpandActionsSelect"/>
16+
<click selector="{{AdminProductFormConfigurationsSection.disableProductBtn}}" stepKey="clickDisableChildProduct"/>
17+
<see selector="{{AdminProductFormConfigurationsSection.confProductOptionStatusCell(productName)}}" userInput="Disabled" stepKey="seeConfigDisabled"/>
18+
</actionGroup>
19+
</actionGroups>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
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="AdminConfigurableWizardMoveToNextStepActionGroup">
12+
<annotations>
13+
<description>Click on the 'Next' button in the 'Create Product Configurations' panel on the Configurable Product creation/edit page.</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="title" type="string"/>
17+
</arguments>
18+
19+
<click selector="{{ConfigurableProductSection.nextButton}}" stepKey="clickNextButton"/>
20+
<waitForPageLoad stepKey="waitForNextStepLoaded"/>
21+
<see userInput="{{title}}" selector="{{AdminProductFormConfigurationsSection.stepsWizardTitle}}" stepKey="seeStepTitle"/>
22+
</actionGroup>
23+
</actionGroups>

app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AdminCreateApiConfigurableProductActionGroup.xml

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -65,21 +65,4 @@
6565
<requiredEntity createDataKey="createConfigChildProduct2"/>
6666
</createData>
6767
</actionGroup>
68-
69-
<!-- Create the configurable product, children are not visible individually -->
70-
<actionGroup name="AdminCreateApiConfigurableProductWithHiddenChildActionGroup" extends="AdminCreateApiConfigurableProductActionGroup">
71-
<annotations>
72-
<description>EXTENDS: AdminCreateApiConfigurableProductActionGroup. Adds 2 Hidden Product Options.</description>
73-
</annotations>
74-
75-
<!-- Create the 2 children that will be a part of the configurable product -->
76-
<createData entity="ApiSimpleOneHidden" stepKey="createConfigChildProduct1">
77-
<requiredEntity createDataKey="createConfigProductAttribute"/>
78-
<requiredEntity createDataKey="getConfigAttributeOption1"/>
79-
</createData>
80-
<createData entity="ApiSimpleTwoHidden" stepKey="createConfigChildProduct2">
81-
<requiredEntity createDataKey="createConfigProductAttribute"/>
82-
<requiredEntity createDataKey="getConfigAttributeOption2"/>
83-
</createData>
84-
</actionGroup>
8568
</actionGroups>

0 commit comments

Comments
 (0)