Skip to content

Commit 25d5f61

Browse files
Karishmathakare19Karishmathakare19
committed
Merge branch 'ACQE-8576' into ACQE-functional-deployment-v3-8
2 parents e8aa5d3 + cfa0d76 commit 25d5f61

File tree

5 files changed

+322
-1
lines changed

5 files changed

+322
-1
lines changed

‎app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AdminSelectSingleImageAndPriceForConfigurationAttributeActionGroup.xml‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright 2025 Adobe
5+
* All Rights Reserved.
6+
*/
7+
-->
8+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="AdminSelectSingleImageAndPriceForConfigurationAttributeActionGroup" extends="AdminSelectAllValueOfTwoAttributesPageActionGroup">
11+
<annotations>
12+
<description>Select values of each attribute to include in the product and assigns a image to the product.</description>
13+
</annotations>
14+
<arguments>
15+
<argument name="price" type="string" defaultValue="100"/>
16+
<argument name="image" type="string" defaultValue="MagentoLogo"/>
17+
</arguments>
18+
<waitForPageLoad stepKey="waitForImagesPage" after="clickNextToApplyQuantity"/>
19+
<click selector="{{AdminCreateProductConfigurationsPanel.applySingleSetOfImages}}"
20+
stepKey="clickApplySingleSetOfImages" after="waitForImagesPage"/>
21+
<waitForElementVisible selector="{{AdminCreateProductConfigurationsPanel.imageUploadButton}}"
22+
stepKey="waitForImageUploadSection" after="clickApplySingleSetOfImages"/>
23+
<attachFile selector="{{AdminCreateProductConfigurationsPanel.imageFileUpload}}" userInput="{{image}}"
24+
stepKey="uploadImageForAllConfigurations" after="waitForImageUploadSection"/>
25+
<waitForElementNotVisible selector="{{AdminCreateProductConfigurationsPanel.uploadProgressBar}}"
26+
stepKey="waitForImageUpload" after="uploadImageForAllConfigurations"/>
27+
<waitForElementClickable selector="{{AdminCreateProductConfigurationsPanel.applySinglePriceToAllSkus}}"
28+
stepKey="waitForPriceRadio" after="waitForImageUpload"/>
29+
<click selector="{{AdminCreateProductConfigurationsPanel.applySinglePriceToAllSkus}}"
30+
stepKey="selectSinglePrice" after="waitForPriceRadio"/>
31+
<fillField selector="{{AdminCreateProductConfigurationsPanel.singlePrice}}" userInput="{{price}}"
32+
stepKey="enterPrice" after="selectSinglePrice"/>
33+
</actionGroup>
34+
</actionGroups>

‎app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AdminSelectTwoOptionsPerAttributeActionGroup.xml‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright 2025 Adobe
5+
* All Rights Reserved.
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="AdminSelectTwoOptionsPerAttributeActionGroup"
12+
extends="GenerateConfigurationsByAttributeCodeActionGroup">
13+
<annotations>
14+
<description>EXTENDS: GenerateConfigurationsByAttributeCodeActionGroup. Selects only 2 specific options from
15+
each attribute instead of all options. Removes confirm popup.
16+
</description>
17+
</annotations>
18+
<arguments>
19+
<argument name="secondAttributeCode" type="string"/>
20+
<argument name="firstAttributeOption1" type="string"/>
21+
<argument name="firstAttributeOption2" type="string"/>
22+
<argument name="secondAttributeOption1" type="string"/>
23+
<argument name="secondAttributeOption2" type="string"/>
24+
</arguments>
25+
<remove keyForRemoval="clickFilters"/>
26+
<remove keyForRemoval="fillFilterAttributeCodeField"/>
27+
<remove keyForRemoval="clickApplyFiltersButton"/>
28+
<remove keyForRemoval="clickOnFirstCheckbox"/>
29+
<remove keyForRemoval="clickOnSelectAll"/>
30+
<remove keyForRemoval="clickOnSelectAllForFirstAttribute"/>
31+
<remove keyForRemoval="clickOnSelectAllForSecondAttribute"/>
32+
<remove keyForRemoval="clickOnConfirmInPopup"/>
33+
<click selector="{{AdminCreateProductConfigurationsPanel.attributeCheckbox(attributeCode)}}"
34+
stepKey="clickOnFirstAttributeCheckbox" after="clickCreateConfigurations"/>
35+
<click selector="{{AdminCreateProductConfigurationsPanel.attributeCheckbox(secondAttributeCode)}}"
36+
stepKey="clickOnSecondAttributeCheckbox" after="clickOnFirstAttributeCheckbox"/>
37+
<grabTextFrom selector="{{AdminCreateProductConfigurationsPanel.defaultLabel(attributeCode)}}"
38+
stepKey="grabFirstAttributeDefaultLabel" after="clickOnSecondAttributeCheckbox"/>
39+
<grabTextFrom selector="{{AdminCreateProductConfigurationsPanel.defaultLabel(secondAttributeCode)}}"
40+
stepKey="grabSecondAttributeDefaultLabel" after="grabFirstAttributeDefaultLabel"/>
41+
<click selector="{{AdminCreateProductConfigurationsPanel.attributeCheckboxByName(firstAttributeOption1)}}"
42+
stepKey="selectFirstAttributeOption1" after="clickOnNextButton1"/>
43+
<click selector="{{AdminCreateProductConfigurationsPanel.attributeCheckboxByName(firstAttributeOption2)}}"
44+
stepKey="selectFirstAttributeOption2" after="selectFirstAttributeOption1"/>
45+
<click selector="{{AdminCreateProductConfigurationsPanel.attributeCheckboxByName(secondAttributeOption1)}}"
46+
stepKey="selectSecondAttributeOption1" after="selectFirstAttributeOption2"/>
47+
<click selector="{{AdminCreateProductConfigurationsPanel.attributeCheckboxByName(secondAttributeOption2)}}"
48+
stepKey="selectSecondAttributeOption2" after="selectSecondAttributeOption1"/>
49+
<click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickOnSaveButton2"
50+
after="clickOnNextButton4"/>
51+
</actionGroup>
52+
</actionGroups>

‎app/code/Magento/ConfigurableProduct/Test/Mftf/Data/ProductConfigurableAttributeData.xml‎

Lines changed: 34 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,11 +87,44 @@
8787
<data key="option2">Blue</data>
8888
<data key="option3">White</data>
8989
</entity>
90+
<entity name="colorProductVisualAttributeWithOptions" extends="colorProductAttribute" type="ProductAttribute">
91+
<data key="default_label" unique="suffix">Color</data>
92+
<data key="input_type">swatch_visual</data>
93+
<data key="scope">Global</data>
94+
</entity>
9095
<entity name="sizeProductAttributeWithOptions" extends="sizeAttribute" type="ProductAttribute">
91-
<data key="input_type">Text Swatch</data>
96+
<data key="default_label" unique="suffix">Size</data>
97+
<data key="input_type">swatch_text</data>
9298
<data key="scope">Global</data>
9399
<data key="option1">Small</data>
94100
<data key="option2">Medium</data>
95101
<data key="option3">Large</data>
102+
<data key="option4">XL</data>
103+
<data key="option5">XXL</data>
104+
<data key="option6">XXXL</data>
105+
</entity>
106+
<entity name="Red" type="SwatchOption">
107+
<data key="admin_label">Red</data>
108+
<data key="default_label">Red</data>
109+
</entity>
110+
<entity name="Blue" type="SwatchOption">
111+
<data key="admin_label">Blue</data>
112+
<data key="default_label">Blue</data>
113+
</entity>
114+
<entity name="Black" type="SwatchOption">
115+
<data key="admin_label">Black</data>
116+
<data key="default_label">Black</data>
117+
</entity>
118+
<entity name="White" type="SwatchOption">
119+
<data key="admin_label">White</data>
120+
<data key="default_label">White</data>
121+
</entity>
122+
<entity name="Green" type="SwatchOption">
123+
<data key="admin_label">Green</data>
124+
<data key="default_label">Green</data>
125+
</entity>
126+
<entity name="Yellow" type="SwatchOption">
127+
<data key="admin_label">Yellow</data>
128+
<data key="default_label">Yellow</data>
96129
</entity>
97130
</entities>

0 commit comments

Comments
 (0)