🔃 [Magento Community Engineering] Community Contributions - 2.4-devel…

…op latest changes Accepted Community Pull Requests: - #31057: [MFTF] Refactoring of AdminMassProductPriceUpdateTest (by @AnnaAPak) - #31371: [MFTF] Refactoring AdminSortingByWebsitesTest (by @AnnaAPak) - #31009: [MFTF]: Refactoring of AdminCreateInvoiceTest (by @AnnaAPak) - #31323: [MFTF] Adding AdminClickRefundOfflineOnNewMemoPageActionGroup (by @AnnaAPak) - #31198: Issues 31197 - Loading wrong order tax info (by @srenon) - #31162: Allow to load base64 encoded images and fonts (by @vovayatsyuk) - #31436: Updating with StorefrontSelectCustomizeAndAddToTheCartButtonActionGroup (by @AnnaAPak) - #31320: Removed CliIndexerReindexActionGroup action group usage for Catalog module (by @sergiy-v) - #31334: Fix issue with logging each cookie as separate context (by @aleksinoleg) - #31330: Update varnish 6 vcl config (by @mrtuvn) - #31308: Fix ftp_nlist for empty folders returns false (by @Nazar65) - #30776: [MFTF] Add AssertStorefrontCartDiscountActionGroup (by @Usik2203) Fixed GitHub Issues: - #31073: [Issue] [MFTF] Refactoring of AdminMassProductPriceUpdateTest (reported by @m2-assistant[bot]) has been fixed in #31057 by @AnnaAPak in 2.4-develop branch Related commits: 1. 97e3454 2. 131cd1a 3. bdb653d 4. faf0c87 5. dd4334d 6. 758b0d6 7. 52e5d2c 8. a048fb7 9. c9e2c6f 10. 6fc4191 11. 64b617f 12. 9691ef6 13. b3efee9 - #31442: [Issue] [MFTF] Refactoring AdminSortingByWebsitesTest (reported by @m2-assistant[bot]) has been fixed in #31371 by @AnnaAPak in 2.4-develop branch Related commits: 1. 2a71255 2. ec105b5 - #31036: [Issue] [MFTF]: Refactoring of AdminCreateInvoiceTest (reported by @m2-assistant[bot]) has been fixed in #31009 by @AnnaAPak in 2.4-develop branch Related commits: 1. 9ffcdc6 2. 0c14e5f 3. ea99547 4. 3e46731 5. d157d42 6. 3d5060f 7. b23cad2 8. 2d8be9c 9. ce7a351 10. 83dab7e - #31325: [Issue] [MFTF] Adding AdminClickRefundOfflineOnNewMemoPageActionGroup (reported by @m2-assistant[bot]) has been fixed in #31323 by @AnnaAPak in 2.4-develop branch Related commits: 1. 37e8487 2. 31eb859 3. 06b3b29 - #31197: Magento loading the wrong Tax info on admin Invoice and Creditmemo page (reported by @srenon) has been fixed in #31198 by @srenon in 2.4-develop branch Related commits: 1. 41c3aa2 2. 4b007c2 3. 0e58811 4. 84b1ea0 - #31170: [Issue] Allow to load base64 encoded images and fonts (reported by @m2-assistant[bot]) has been fixed in #31162 by @vovayatsyuk in 2.4-develop branch Related commits: 1. 2f10855 2. 7de93bb 3. 1f201ae 4. 5e35bb3 5. 2b15a1f - #31437: [Issue] Updating with StorefrontSelectCustomizeAndAddToTheCartButtonActionGroup (reported by @m2-assistant[bot]) has been fixed in #31436 by @AnnaAPak in 2.4-develop branch Related commits: 1. 1f04b0a - #31327: [Issue] Removed CliIndexerReindexActionGroup action group usage for Catalog module (reported by @m2-assistant[bot]) has been fixed in #31320 by @sergiy-v in 2.4-develop branch Related commits: 1. 3a808ff 2. a40f256 3. 57e23c6 4. 9ca51cd - #31471: [Issue] Fix issue with logging each cookie as separate context (reported by @m2-assistant[bot]) has been fixed in #31334 by @aleksinoleg in 2.4-develop branch Related commits: 1. 01eb682 - #31445: [Issue] Update varnish 6 vcl config (reported by @m2-assistant[bot]) has been fixed in #31330 by @mrtuvn in 2.4-develop branch Related commits: 1. e07d328 - #31288: FileSystem IO Ftp connection ls() method error for empty folders (reported by @Nazar65) has been fixed in #31308 by @Nazar65 in 2.4-develop branch Related commits: 1. 5559a51 2. c42d022 - #30784: [Issue] [MFTF] Add AssertStorefrontCartDiscountActionGroup (reported by @m2-assistant[bot]) has been fixed in #30776 by @Usik2203 in 2.4-develop branch Related commits: 1. 7806115 2. 1851fe8 3. 91e72ed 4. d4e7e1e 5. 57011bd 6. a231737
magento · Jan 6, 2021 · 6f79389 · 6f79389
2 parents 95b1233 + 976b696
commit 6f79389
Show file tree

Hide file tree

Showing 62 changed files with 505 additions and 235 deletions.
diff --git a/.../Magento/Catalog/Test/Mftf/ActionGroup/AdminChangeWebSiteAssignedToProductActionGroup.xml b/.../Magento/Catalog/Test/Mftf/ActionGroup/AdminChangeWebSiteAssignedToProductActionGroup.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminChangeWebSiteAssignedToProductActionGroup" extends="AddWebsiteToProductActionGroup">
+        <annotations>
+            <description>Extends AddWebsiteToProductActionGroup. Changes website assigned to product from websiteToDeselect to website</description>
+        </annotations>
+        <arguments>
+            <argument name="websiteToDeselect" type="string"/>
+        </arguments>
+
+        <uncheckOption selector="{{ProductInWebsitesSection.website(websiteToDeselect)}}" stepKey="uncheckWebsite" after="checkWebsite"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCheckProductOnProductGridActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCheckProductOnProductGridActionGroup.xml
@@ -1,22 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>	
-<!--	
- /**	
-  * Copyright © Magento, Inc. All rights reserved.	
-  * See COPYING.txt for license details.	
-  */	
--->	
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
 
-<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"	
-              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">	
-    <actionGroup name="AdminCheckProductOnProductGridActionGroup">	
-        <annotations>	
-            <description>Check the checkbox for the product on the Product Grid</description>	
-        </annotations>	
-        <arguments>	
-            <argument name="product" type="entity"/>	
-        </arguments>	
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+  <actionGroup name="AdminCheckProductOnProductGridActionGroup">
+    <annotations>
+        <description>Check the checkbox for the product on the Product Grid</description>
+    </annotations>
+    <arguments>
+        <argument name="product" type="entity"/>
+    </arguments>
 
-      <checkOption selector="{{AdminProductGridSection.productRowCheckboxBySku(product.sku)}}" stepKey="selectProduct"/>    	
+    <checkOption selector="{{AdminProductGridSection.productRowCheckboxBySku(product.sku)}}" stepKey="selectProduct"/>
 
-    </actionGroup>	
-</actionGroups> 
+  </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminSetPriceForMassUpdateActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminSetPriceForMassUpdateActionGroup.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminSetPriceForMassUpdateActionGroup">
+        <annotations>
+            <description>Click the "Change" checkbox for the "Price" field. Set new price.</description>
+        </annotations>
+        <arguments>
+            <argument name="price" type="string"/>
+        </arguments>
+
+        <scrollTo stepKey="scrollToPriceCheckBox" selector="{{AdminEditProductAttributesSection.ChangeAttributePriceToggle}}"  x="0" y="-160"/>
+        <click selector="{{AdminEditProductAttributesSection.ChangeAttributePriceToggle}}" stepKey="selectPriceCheckBox"/>
+        <fillField stepKey="fillPrice" selector="{{AdminEditProductAttributesSection.AttributePrice}}" userInput="{{price}}"/>
+
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminSortProductsGridByActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminSortProductsGridByActionGroup.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminSortProductsGridByActionGroup">
+        <annotations>
+            <description>Sorts the Product Grid by field</description>
+        </annotations>
+        <arguments>
+            <argument name="field" type="string"/>
+        </arguments>
+
+        <click selector="{{AdminProductGridSection.columnHeader(field)}}" stepKey="clickWebsitesHeaderToSort"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForApplyingChanges"/>
+    </actionGroup>
+</actionGroups>
diff --git a/...nto/Catalog/Test/Mftf/ActionGroup/AssertAdminProductPriceUpdatedOnEditPageActionGroup.xml b/...nto/Catalog/Test/Mftf/ActionGroup/AssertAdminProductPriceUpdatedOnEditPageActionGroup.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AssertAdminProductPriceUpdatedOnEditPageActionGroup" extends="OpenEditProductOnBackendActionGroup">
+        <annotations>
+            <description>Validate if Product price is updated on the Product creation/edit page</description>
+        </annotations>
+        <arguments>
+            <argument name="product" type="entity"/>
+            <argument name="price" type="string"/>
+        </arguments>
+
+        <waitForPageLoad stepKey="waitForProductToLoad"/>
+        <seeInField selector="{{AdminProductFormSection.productName}}" userInput="{{product.name}}" stepKey="seeProductName"/>
+        <seeInField selector="{{AdminProductFormSection.productSku}}" userInput="{{product.sku}}" stepKey="seeProductSku"/>
+        <seeInField selector="{{AdminProductFormSection.productPrice}}" userInput="{{price}}" stepKey="seeProductPrice"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AddOutOfStockProductToCompareListTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AddOutOfStockProductToCompareListTest.xml
@@ -56,7 +56,7 @@
 
         <comment userInput="Clear cache and reindex | Comment is kept to preserve the step key for backward compatibility" stepKey="cleanCache"/>
         <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
-           <argument name="indices" value=""/>
+            <argument name="indices" value="catalog_product_price"/>
         </actionGroup>
         <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
            <argument name="tags" value=""/>

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddInStockProductToTheCartTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddInStockProductToTheCartTest.xml
@@ -58,10 +58,7 @@
         <actionGroup ref="AdminSubmitAdvancedInventoryFormActionGroup" stepKey="clickOnDoneButton"/>
         <actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickOnSaveButton"/>
         <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the product." stepKey="messageYouSavedTheProductIsShown"/>
-        <!--Clear cache and reindex-->
-        <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
-            <argument name="indices" value=""/>
-        </actionGroup>
+        <comment userInput="Adding the comment to replace CliIndexerReindexActionGroup action group ('indexer:reindex' commands) for preserving Backward Compatibility" stepKey="reindex"/>
         <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
             <argument name="tags" value=""/>
         </actionGroup>

diff --git a/...de/Magento/Catalog/Test/Mftf/Test/AdminCheckCustomAttributeValuesAfterProductSaveTest.xml b/...de/Magento/Catalog/Test/Mftf/Test/AdminCheckCustomAttributeValuesAfterProductSaveTest.xml
@@ -33,9 +33,7 @@
             </createData>
             <!-- Create simple product -->
             <createData entity="SimpleProduct2" stepKey="createSimpleProduct"/>
-            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindexCatalogSearch">
-                <argument name="indices" value="catalogsearch_fulltext"/>
-            </actionGroup>
+            <comment userInput="Adding the comment to replace CliIndexerReindexActionGroup action group ('indexer:reindex' commands) for preserving Backward Compatibility" stepKey="reindexCatalogSearch"/>
             <!-- Login to Admin page -->
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
         </before>

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassProductPriceUpdateTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassProductPriceUpdateTest.xml
@@ -29,52 +29,60 @@
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
 
-        <!--Open Product Index Page-->
         <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductIndex"/>
 
-        <!--Search products using keyword -->
-        <actionGroup ref="SearchProductGridByKeyword2ActionGroup" stepKey="searchByKeyword">
-            <argument name="keyword" value="Testp"/>
-        </actionGroup>
+        <actionGroup ref="ClearFiltersAdminProductGridActionGroup" stepKey="searchByKeyword"/>
 
-        <!--Sort Products by ID in descending order-->
         <actionGroup ref="SortProductsByIdDescendingActionGroup" stepKey="sortProductsByIdDescending"/>
 
-        <!--Select products-->
-        <checkOption selector="{{AdminProductGridSection.productRowCheckboxBySku($$simpleProduct1.sku$$)}}" stepKey="selectFirstProduct"/>
-        <checkOption selector="{{AdminProductGridSection.productRowCheckboxBySku($$simpleProduct2.sku$$)}}" stepKey="selectSecondProduct"/>
+        <actionGroup ref="AdminCheckProductOnProductGridActionGroup" stepKey="selectFirstProduct">
+           <argument name="product" value="$simpleProduct1$"/>
+        </actionGroup>
+        <actionGroup ref="AdminCheckProductOnProductGridActionGroup" stepKey="selectSecondProduct">
+           <argument name="product" value="$simpleProduct2$"/>
+        </actionGroup>
+
+        <actionGroup ref="AdminClickMassUpdateProductAttributesActionGroup" stepKey="clickDropdown"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="clickChangeStatus"/> 
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForProductAttributePageToLoad"/>  
 
-        <!-- Update product price-->
-        <click selector="{{AdminProductGridSection.bulkActionDropdown}}" stepKey="clickDropdown"/>
-        <click selector="{{AdminProductGridSection.bulkActionOption('Update attributes')}}" stepKey="clickChangeStatus"/>
-        <waitForPageLoad stepKey="waitForProductAttributePageToLoad"/>
-        <scrollTo stepKey="scrollToPriceCheckBox" selector="{{AdminEditProductAttributesSection.ChangeAttributePriceToggle}}"  x="0" y="-160"/>
-        <click selector="{{AdminEditProductAttributesSection.ChangeAttributePriceToggle}}" stepKey="selectPriceCheckBox"/>
-        <fillField stepKey="fillPrice" selector="{{AdminEditProductAttributesSection.AttributePrice}}" userInput="90.99"/>
-        <click stepKey="clickOnSaveButton" selector="{{AdminEditProductAttributesSection.Save}}"/>
-        <waitForPageLoad stepKey="waitForUpdatedProductToSave" />
-        <see selector="{{AdminProductMessagesSection.successMessage}}" userInput="Message is added to queue" stepKey="seeAttributeUpateSuccessMsg"/>
+        <actionGroup ref="AdminSetPriceForMassUpdateActionGroup" stepKey="scrollToPriceCheckBox">  
+           <argument name="price" value="90.99"/>
+        </actionGroup>   
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="selectPriceCheckBox"/> 
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="fillPrice"/>  
+
+        <actionGroup ref="AdminSaveProductsMassAttributesUpdateActionGroup" stepKey="clickOnSaveButton"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForUpdatedProductToSave"/> 
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="seeAttributeUpateSuccessMsg"/>   
 
-        <!-- Start message queue -->
         <actionGroup ref="CliConsumerStartActionGroup" stepKey="startMessageQueueConsumer">
             <argument name="consumerName" value="{{AdminProductAttributeUpdateConsumerData.consumerName}}"/>
             <argument name="maxMessages" value="{{AdminProductAttributeUpdateConsumerData.messageLimit}}"/>
         </actionGroup>
-        <!-- Run cron -->
+
         <magentoCLI command="cron:run --group=index" stepKey="runCron"/>
 
-        <!--Verify product name, sku and updated price-->
-        <click stepKey="openFirstProduct" selector="{{AdminProductGridSection.productRowBySku($$simpleProduct1.sku$$)}}"/>
-        <waitForPageLoad stepKey="waitForFirstProductToLoad"/>
-        <seeInField stepKey="seeFirstProductNameInField" selector="{{AdminProductFormSection.productName}}" userInput="$$simpleProduct1.name$$"/>
-        <seeInField stepKey="seeFirstProductSkuInField" selector="{{AdminProductFormSection.productSku}}" userInput="$$simpleProduct1.sku$$"/>
-        <seeInField stepKey="seeFirstProductPriceInField" selector="{{AdminProductFormSection.productPrice}}" userInput="90.99"/>
-        <click stepKey="clickOnBackButton" selector="{{AdminGridMainControls.back}}"/>
-        <waitForPageLoad stepKey="waitForProductsToLoad"/>
-        <click stepKey="openSecondProduct" selector="{{AdminProductGridSection.productRowBySku($$simpleProduct2.sku$$)}}"/>
-        <waitForPageLoad stepKey="waitForSecondProductToLoad"/>
-        <seeInField stepKey="seeSecondProductNameInField" selector="{{AdminProductFormSection.productName}}" userInput="$$simpleProduct2.name$$"/>
-        <seeInField stepKey="seeSecondProductSkuInField" selector="{{AdminProductFormSection.productSku}}" userInput="$$simpleProduct2.sku$$"/>
-        <seeInField stepKey="seeSecondProductPriceInField" selector="{{AdminProductFormSection.productPrice}}" userInput="90.99"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="openFirstProduct"/>  
+        <actionGroup ref="AssertAdminProductPriceUpdatedOnEditPageActionGroup" stepKey="waitForFirstProductToLoad">
+             <argument name="product" value="$$simpleProduct1$$"/>
+             <argument name="price" value="90.99"/>
+        </actionGroup>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="seeFirstProductNameInField"/> 
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="seeFirstProductSkuInField"/>   
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="seeFirstProductPriceInField"/>   
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="clickOnBackButton"/>   
+
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="waitForProductsToLoad"/>
+
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="openSecondProduct"/> 
+        <actionGroup ref="AssertAdminProductPriceUpdatedOnEditPageActionGroup" stepKey="waitForSecondProductToLoad">
+             <argument name="product" value="$$simpleProduct2$$"/>
+             <argument name="price" value="90.99"/>
+        </actionGroup>   
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="seeSecondProductNameInField"/>   
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="seeSecondProductSkuInField"/>   
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="seeSecondProductPriceInField"/>   
+
     </test>
 </tests>
diff --git a/...ento/Catalog/Test/Mftf/Test/AdminSimpleProductImagesTest/AdminSimpleProductImagesTest.xml b/...ento/Catalog/Test/Mftf/Test/AdminSimpleProductImagesTest/AdminSimpleProductImagesTest.xml
@@ -141,9 +141,7 @@
 
         <!-- Save the second product -->
         <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProduct2"/>
-        <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
-            <argument name="indices" value=""/>
-        </actionGroup>
+        <comment userInput="Adding the comment to replace CliIndexerReindexActionGroup action group ('indexer:reindex' commands) for preserving Backward Compatibility" stepKey="reindex"/>
         <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
             <argument name="tags" value=""/>
         </actionGroup>

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminSortingByWebsitesTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminSortingByWebsitesTest.xml
@@ -25,7 +25,7 @@
             </createData>
 
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
-            <!--Create new website -->
+
             <actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="createAdditionalWebsite">
                 <argument name="newWebsiteName" value="{{customWebsite.name}}"/>
                 <argument name="websiteCode" value="{{customWebsite.code}}"/>
@@ -52,31 +52,30 @@
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
 
-        <!--Assign Custom Website to Simple Product -->
-        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToCatalogProductGrid"/>
-
-        <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFiltersInitial"/>
+        <actionGroup ref="AdminClearFiltersActionGroup" stepKey="navigateToCatalogProductGrid"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="clickClearFiltersInitial"/>
         <actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="assignCustomWebsiteToProduct">
             <argument name="product" value="$$productAssignedToCustomWebsite$$"/>
         </actionGroup>
-        <scrollTo selector="{{ProductInWebsitesSection.sectionHeader}}" stepKey="scrollToWebsites"/>
-        <conditionalClick selector="{{ProductInWebsitesSection.sectionHeader}}" dependentSelector="{{AdminProductContentSection.sectionHeaderShow}}" visible="false" stepKey="expandSection"/>
-        <waitForPageLoad stepKey="waitForPageOpened"/>
-        <uncheckOption selector="{{ProductInWebsitesSection.website(_defaultWebsite.name)}}" stepKey="deselectMainWebsite"/>
-        <checkOption selector="{{ProductInWebsitesSection.website(customWebsite.name)}}" stepKey="selectWebsite"/>
-
-        <actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSave"/>
-        <seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="seeSaveProductMessageAgain"/>
+        <actionGroup ref="AdminChangeWebSiteAssignedToProductActionGroup" stepKey="scrollToWebsites">
+            <argument name="website" value="{{customWebsite.name}}"/>
+            <argument name="websiteToDeselect" value="{{_defaultWebsite.name}}"/>
+        </actionGroup>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="expandSection"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForPageOpened"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="deselectMainWebsite"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="selectWebsite"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="clickSave"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="seeSaveProductMessageAgain"/>
 
-        <!--Navigate To Product Grid To Check Website Sorting-->
         <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToCatalogProductGridToSortByWebsite"/>
-
-        <!--Sorting works (By Websites) ASC-->
-        <click selector="{{AdminProductGridSection.columnHeader('Websites')}}" stepKey="clickWebsitesHeaderToSortAsc"/>
+        <actionGroup ref="AdminSortProductsGridByActionGroup" stepKey="clickWebsitesHeaderToSortAsc">
+            <argument name="field" value="Websites"/>
+        </actionGroup>
         <see selector="{{AdminProductGridSection.productGridContentsOnRow('1')}}" userInput="Main Website" stepKey="checkIfProduct1WebsitesAsc"/>
-
-        <!--Sorting works (By Websites) DESC-->
-        <click selector="{{AdminProductGridSection.columnHeader('Websites')}}" stepKey="clickWebsitesHeaderToSortDesc"/>
+        <actionGroup ref="AdminSortProductsGridByActionGroup" stepKey="clickWebsitesHeaderToSortDesc">
+            <argument name="field" value="Websites"/>
+        </actionGroup>
         <see selector="{{AdminProductGridSection.productGridContentsOnRow('1')}}" userInput="{{customWebsite.name}}" stepKey="checkIfProduct1WebsitesDesc"/>
     </test>
 </tests>