Skip to content

Commit d46da95

Browse files
nishant04412nishant04412
committed
Made CR suggested changes in mftf
1 parent e0cfb99 commit d46da95

File tree

3 files changed

+48
-86
lines changed

3 files changed

+48
-86
lines changed

‎app/code/Magento/Swatches/Test/Mftf/ActionGroup/AddTextSwatchToConfigurableProductActionGroup.xml‎

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

‎app/code/Magento/Swatches/Test/Mftf/Data/SwatchProductAttributeFrontendLabelData.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,8 @@
1212
<data key="store_id">0</data>
1313
<data key="label" unique="suffix">Swatch-Attribute-</data>
1414
</entity>
15+
<entity name="SwatchProductSizeAttribute" type="FrontendLabel">
16+
<data key="frontend_label">Set Size</data>
17+
<data key="attribute_code">set_size</data>
18+
</entity>
1519
</entities>

‎app/code/Magento/Swatches/Test/Mftf/Test/StorefrontConfigurableOptionsImportSameBaseImageTest.xml‎

Lines changed: 44 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -40,43 +40,63 @@
4040
</helper>
4141
</before>
4242
<after>
43-
<actionGroup ref="AdminDeleteProductAttributeByLabelActionGroup" stepKey="deleteAttribute">
44-
<argument name="productAttributeLabel" value="Set Size" />
45-
</actionGroup>
4643
<helper class="Magento\Catalog\Test\Mftf\Helper\LocalFileAssertions" method="deleteDirectory" stepKey="deleteProductImageDirectory">
4744
<argument name="path">var/import/images/{{ImportProduct_Configurable.name}}</argument>
4845
</helper>
46+
<actionGroup ref="DeleteProductBySkuActionGroup" stepKey="deleteConfigurableProduct">
47+
<argument name="sku" value="import-product-configurable"/>
48+
</actionGroup>
49+
<actionGroup ref="DeleteProductBySkuActionGroup" stepKey="deleteConfigurableProduct2">
50+
<argument name="sku" value="import-product-simple1-configurable"/>
51+
</actionGroup>
52+
<actionGroup ref="DeleteProductBySkuActionGroup" stepKey="deleteConfigurableProduct3">
53+
<argument name="sku" value="import-product-simple2-configurable"/>
54+
</actionGroup>
55+
<actionGroup ref="DeleteProductBySkuActionGroup" stepKey="deleteConfigurableProduct4">
56+
<argument name="sku" value="import-product-simple3-configurable"/>
57+
</actionGroup>
58+
<actionGroup ref="AdminDeleteProductAttributeByLabelActionGroup" stepKey="deleteAttribute">
59+
<argument name="productAttributeLabel" value="Set Size" />
60+
</actionGroup>
4961
<!-- Logout -->
5062
<actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
51-
<!-- Reindex invalidated indices after product attribute has been created/deleted -->
52-
<magentoCron groups="index" stepKey="reindexInvalidatedIndices"/>
5363
</after>
54-
<!--Create text swatch attribute with 3 options: Small, Medium and Large-->
55-
<actionGroup ref="AddTextSwatchToConfigurableProductActionGroup" stepKey="addSizeAttribute">
56-
<argument name="attributeName" value="Set Size"/>
57-
<argument name="attributeCode" value="set_size"/>
58-
<argument name="4" value="4"/>
59-
<argument name="24" value="24"/>
60-
<argument name="30" value="30"/>
64+
<!--Create text swatch attribute with 3 options: 4, 24 and 30-->
65+
<actionGroup ref="AddTextSwatchToProductActionGroup" stepKey="addSizeAttribute">
66+
<argument name="attributeName" value="{{SwatchProductSizeAttribute.frontend_label}}"/>
67+
<argument name="attributeCode" value="{{SwatchProductSizeAttribute.attribute_code}}"/>
68+
<argument name="option1" value="4"/>
69+
<argument name="option2" value="24"/>
70+
<argument name="option3" value="30"/>
71+
</actionGroup>
72+
73+
<!-- Go to created attribute (attribute page) -->
74+
<actionGroup ref="NavigateToEditProductAttributeActionGroup" stepKey="navigateToSkuProductAttribute">
75+
<argument name="ProductAttribute" value="{{SwatchProductSizeAttribute.frontend_label}}"/>
6176
</actionGroup>
62-
<amOnPage url="{{AdminProductAttributeSetGridPage.url}}" stepKey="amOnAttributeSetPage"/>
63-
<click selector="{{AdminProductAttributeSetGridSection.AttributeSetName('Default')}}" stepKey="chooseDefaultAttributeSet"/>
64-
<waitForPageLoad stepKey="waitForAttributeSetPageLoad"/>
65-
<dragAndDrop selector1="{{UnassignedAttributes.ProductAttributeName('set_size')}}" selector2="{{Group.FolderName('Product Details')}}" stepKey="moveProductAttributeToGroup"/>
66-
<click selector="{{AttributeSetSection.Save}}" stepKey="saveAttributeSet"/>
67-
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear" />
77+
<!-- Set 'yes' value for option "Update Product Preview Image" -->
78+
<actionGroup ref="AdminUpdateProductPreviewImageActionGroup" stepKey="setUpdateProductPreviewImage" after="navigateToSkuProductAttribute"/>
79+
<!-- Save Product Attribute -->
80+
<actionGroup ref="SaveProductAttributeActionGroup" stepKey="saveAttribute" after="setUpdateProductPreviewImage"/>
81+
82+
<actionGroup ref="AdminOpenAttributeSetGridPageActionGroup" stepKey="openAttributeSetPage"/>
83+
84+
<!-- From grid, click on attribute set Default -->
85+
<actionGroup ref="AdminOpenAttributeSetByNameActionGroup" stepKey="openDefaultAttributeSet"/>
86+
87+
<!-- Add Product Attribute to Default attribute by dragging and dropping this to the 'Project Details' folder. Then Save. -->
88+
<actionGroup ref="AssignAttributeToGroupActionGroup" stepKey="assignAttributeToGroup">
89+
<argument name="group" value="Product Details"/>
90+
<argument name="attribute" value="{{SwatchProductSizeAttribute.attribute_code}}"/>
91+
</actionGroup>
92+
<actionGroup ref="SaveAttributeSetActionGroup" stepKey="saveAttributeSet"/>
6893

6994
<actionGroup ref="AdminImportProductsWithCustomImagesDirectoryActionGroup" stepKey="adminImportProduct">
7095
<argument name="behavior" value="Add/Update"/>
7196
<argument name="importFile" value="import_configurable_product_same_images.csv"/>
7297
<argument name="imagesFileDirectory" value="{{ImportProduct_Configurable.name}}"/>
7398
</actionGroup>
74-
75-
<!-- Reindex invalidated indices after product attribute has been created/deleted -->
76-
<magentoCron groups="index" stepKey="reindexInvalidatedIndices"/>
77-
<actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanInvalidatedCaches">
78-
<argument name="tags" value="config full_page"/>
79-
</actionGroup>
99+
<waitForPageLoad time="30" stepKey="waitForSaveImportProduct"/>
80100

81101
<!-- Open the configurable product page on storefront -->
82102
<actionGroup ref="OpenStoreFrontProductPageActionGroup" stepKey="goToProductPage">
@@ -95,18 +115,5 @@
95115
<actionGroup ref="StorefrontSelectSwatchOptionOnProductPageActionGroup" stepKey="selectThirdOptionValue">
96116
<argument name="optionName" value="30"/>
97117
</actionGroup>
98-
99-
<actionGroup ref="DeleteProductBySkuActionGroup" stepKey="deleteConfigurableProduct">
100-
<argument name="sku" value="import-product-configurable"/>
101-
</actionGroup>
102-
<actionGroup ref="DeleteProductBySkuActionGroup" stepKey="deleteConfigurableProduct2">
103-
<argument name="sku" value="import-product-simple1-configurable"/>
104-
</actionGroup>
105-
<actionGroup ref="DeleteProductBySkuActionGroup" stepKey="deleteConfigurableProduct3">
106-
<argument name="sku" value="import-product-simple2-configurable"/>
107-
</actionGroup>
108-
<actionGroup ref="DeleteProductBySkuActionGroup" stepKey="deleteConfigurableProduct4">
109-
<argument name="sku" value="import-product-simple3-configurable"/>
110-
</actionGroup>
111118
</test>
112119
</tests>

0 commit comments

Comments
 (0)