🔃 [Magento Community Engineering] Community Contributions - 2.4-develop expedited

Accepted Community Pull Requests:
 - #29054: Remove duplicated var customer.name from email template (by @ptylek)
 - #27516: [Fixed #26191] Need To Change Label In Totals Block in Order View Page (by @madhurajawat)
 - #28797: Fixed 'Undefined class constant' error when interceptor is generated. (by @vovayatsyuk)
 - #26660: Added The return of Post Value when an Integration Exception is thrown while Save Action (by @realadityayadav)
 - #29002: [MFTF] Use action group for QuickSearch (by @Usik2203)
 - #28955: [MFTF] use action group go to home page (by @Usik2203)
 - #28925: [MFTF] use action group for go to orders grid page (by @Usik2203)
 - #28839: Discount  applying on Shipping Amount for the rule 'Buy X get Y free (discount amount is Y)' (by @engcom-Echo)
 - #28752: "Create Permanent Redirect for URLs if URL Key Changed" for categories (by @engcom-Charlie)
 - #28799: fix Rest-API updating product stock_item deletes downloadable product data (by @engcom-Charlie)
 - #28549: Cli config show returns `Configuration ... doesn't exist` if value is 0 or empty string (by @engcom-Charlie)
 - #28903: Create or update customer don't validate customer group id (by @engcom-Charlie)
 - #28959: [MFTF] use action group to click save button (by @Usik2203)
 - #28932: Implemented UrlFilterApplier component (by @gabrieldagama)
 - #28366: Fix Images in grid is not correctly aligned after clear filters  (by @Nazar65)
 - #28749: Move localstorage polyfill to frontend (by @ihor-sviziev)


Fixed GitHub Issues:
 - #29087: [Issue] Remove duplicated var customer.name from email template (reported by @m2-assistant[bot]) has been fixed in #29054 by @ptylek in 2.4-develop branch
   Related commits:
     1. c9cc512

 - #26191: Need To Change Label In Totals Block in Order View Page (reported by @nit-it) has been fixed in #27516 by @madhurajawat in 2.4-develop branch
   Related commits:
     1. d3021f9
     2. 012821a
     3. 8c2159c
     4. 6eae776
     5. 02acf22
     6. 7986ed6
     7. f9d9f8d
     8. 017102b
     9. 8d952c3
     10. 4e7d530
     11. 8f73ab2
     12. 1619403
     13. 18cc491
     14. 474232a
     15. 79e1eb0
     16. 5435634
     17. d3dfc52

 - #28981: [Issue] Fixed 'Undefined class constant' error when interceptor is generated. (reported by @m2-assistant[bot]) has been fixed in #28797 by @vovayatsyuk in 2.4-develop branch
   Related commits:
     1. 54531b3
     2. 1785136
     3. 7620af2
     4. dbad97b

 - #28143: [Issue] Added The return of Post Value when an Integration Exception is thrown while Save Action (reported by @m2-backlog[bot]) has been fixed in #26660 by @realadityayadav in 2.4-develop branch
   Related commits:
     1. 4459cb0
     2. bad241b
     3. aa59c0b
     4. 38bf16e
     5. 04146b6
     6. 59f031a
     7. 29c7c90
     8. f172e3c

 - #26723: Discount is not applying on Shipping Amount for the rule 'Buy X get Y free (discount amount is Y)'. (reported by @webkul-dhananjay) has been fixed in #28839 by @engcom-Echo in 2.4-develop branch
   Related commits:
     1. 6005a92
     2. ed1a21e
     3. 3b33889

 - #24922: "Create Permanent Redirect for URLs if URL Key Changed" for categories (reported by @vseager) has been fixed in #28752 by @engcom-Charlie in 2.4-develop branch
   Related commits:
     1. 733d72a
     2. 4592de4
     3. a618259
     4. efb73f7
     5. 3cbe1ea
     6. fbf5d3e
     7. 0c9623a
     8. b729b5a

 - #21811: Rest-API updating product stock_item deletes downloadable_product_links (reported by @EyalAmir) has been fixed in #28799 by @engcom-Charlie in 2.4-develop branch
   Related commits:
     1. a09d71a
     2. 7e6827d
     3. c52c6e9
     4. da41991

 - #23290: ./bin/magento config:show returns "Configuration for path: '...' doesn't exist" if config value equals to 0 or empty string (reported by @OleksiiBulba) has been fixed in #28549 by @engcom-Charlie in 2.4-develop branch
   Related commits:
     1. 3bff446
     2. a6049d5
     3. 70809f9
     4. 655f5ab
     5. 36ff6d7
     6. 0ac7e12

 - #28064: Web Api to create customer don't validate payload data and create corrupted record (reported by @GDauer) has been fixed in #28903 by @engcom-Charlie in 2.4-develop branch
   Related commits:
     1. a16efb6
     2. 7f8dd44
     3. b0b6dc9
     4. 616f082
     5. 4ae198a
     6. 360173a

 - #1501: magento2\lib\internal\Magento\Framework\Webapi\Rest\Request.php line:144 (reported by @zhaoxiong123) has been fixed in #28932 by @gabrieldagama in 2.4-develop branch
   Related commits:
     1. be428f7
     2. 984dab1
     3. 5531f50
     4. 1574740
     5. 607aed6
     6. 22c2be9
     7. 58158aa
     8. 1467c6e
     9. 273607c
     10. 8660c73
     11. a8c3f67
     12. 96e6752
     13. c77d812
     14. 03b3ef5
     15. b4b16ff
     16. 8af0f46

 - #824: Unable to reindex from backend, bug? (reported by @MagePsycho) has been fixed in #28366 by @Nazar65 in 2.4-develop branch
   Related commits:
     1. 8bfc104
     2. a5a13fb
     3. 5667714
     4. a867d70
     5. 1d0316d
     6. d06fd27
     7. f953f35
     8. a0ed711
     9. a63e681
     10. 2133abc
     11. 5032914
     12. a548863
     13. 6e8c990
     14. aef54e3

 - #972: Pub/Static directory is empty (reported by @mrugeshrocks) has been fixed in #28366 by @Nazar65 in 2.4-develop branch
   Related commits:
     1. 8bfc104
     2. a5a13fb
     3. 5667714
     4. a867d70
     5. 1d0316d
     6. d06fd27
     7. f953f35
     8. a0ed711
     9. a63e681
     10. 2133abc
     11. 5032914
     12. a548863
     13. 6e8c990
     14. aef54e3

 - #28900: [Issue] Move localstorage polyfill to frontend (reported by @m2-assistant[bot]) has been fixed in #28749 by @ihor-sviziev in 2.4-develop branch
   Related commits:
     1. 29b501a
     2. cc01557

Author: magento-engcom-team

app/code/Magento/Backend/Test/Mftf/Test/AdminDashboardWithChartsTest.xml

@@ -93,8 +93,7 @@
         <see selector="{{AdminOrderDetailsMessagesSection.successMessage}}" userInput="The invoice has been created." stepKey="seeSuccessInvoiceMessage"/>
         <!--Create Shipment for the order-->
         <comment userInput="Create Shipment for the order" stepKey="createShipmentForOrder"/>
-        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="onOrdersPage2"/>
-        <waitForPageLoad time="30" stepKey="waitForOrderListPageLoading"/>
+        <actionGroup ref="AdminOrdersPageOpenActionGroup" stepKey="onOrdersPage2"/>
         <actionGroup ref="AdminOrderGridClickFirstRowActionGroup" stepKey="openOrderPageForShip"/>
         <click selector="{{AdminOrderDetailsMainActionsSection.ship}}" stepKey="clickShipAction"/>
         <waitForPageLoad stepKey="waitForShipmentPagePage"/>

app/code/Magento/Bundle/Test/Mftf/Test/AdminDeleteBundleDynamicProductTest.xml

@@ -40,10 +40,9 @@
         <amOnPage url="{{StorefrontProductPage.url($$createDynamicBundleProduct.name$$)}}" stepKey="amOnBundleProductPage"/>
         <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="Whoops, our bad..." stepKey="seeWhoops"/>
         <!-- Search for the product by sku -->
-        <fillField selector="{{StorefrontQuickSearchSection.searchPhrase}}" userInput="$$createDynamicBundleProduct.sku$$" stepKey="fillSearchBarByProductSku"/>
-        <waitForPageLoad stepKey="waitForSearchButton"/>
-        <click selector="{{StorefrontQuickSearchSection.searchButton}}" stepKey="clickSearchButton"/>
-        <waitForPageLoad stepKey="waitForSearchResults"/>
+        <actionGroup ref="StoreFrontQuickSearchActionGroup" stepKey="searchByCreatedTerm">
+            <argument name="query" value="$$createDynamicBundleProduct.sku$$"/>
+        </actionGroup>
          <!-- Should not see any search results -->
         <dontSee userInput="$$createDynamicBundleProduct.sku$$" selector="{{StorefrontCatalogSearchMainSection.searchResults}}" stepKey="dontSeeProduct"/>
         <see selector="{{StorefrontCatalogSearchMainSection.message}}" userInput="Your search returned no results." stepKey="seeCantFindProductOneMessage"/>

app/code/Magento/Bundle/Test/Mftf/Test/AdminDeleteBundleFixedProductTest.xml

@@ -37,10 +37,9 @@
         <amOnPage url="{{StorefrontProductPage.url($$createFixedBundleProduct.name$$)}}" stepKey="amOnBundleProductPage"/>
         <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="Whoops, our bad..." stepKey="seeWhoops"/>
         <!-- Search for the product by sku -->
-        <fillField selector="{{StorefrontQuickSearchSection.searchPhrase}}" userInput="$$createFixedBundleProduct.sku$$" stepKey="fillSearchBarByProductSku"/>
-        <waitForPageLoad stepKey="waitForSearchButton"/>
-        <click selector="{{StorefrontQuickSearchSection.searchButton}}" stepKey="clickSearchButton"/>
-        <waitForPageLoad stepKey="waitForSearchResults"/>
+        <actionGroup ref="StoreFrontQuickSearchActionGroup" stepKey="searchByCreatedTerm">
+            <argument name="query" value="$$createFixedBundleProduct.sku$$"/>
+        </actionGroup>
         <!-- Should not see any search results -->
         <dontSee userInput="$$createFixedBundleProduct.sku$$" selector="{{StorefrontCatalogSearchMainSection.searchResults}}" stepKey="dontSeeProduct"/>
         <see selector="{{StorefrontCatalogSearchMainSection.message}}" userInput="Your search returned no results." stepKey="seeCantFindProductOneMessage"/>

app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductFormSaveButtonClickActionGroup.xml

@@ -0,0 +1,19 @@
+<?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="AdminProductFormSaveButtonClickActionGroup">
+        <annotations>
+            <description>Click Save button of product form.</description>
+        </annotations>
+
+        <click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
+        <waitForPageLoad stepKey="waitForProductSaved"/>
+    </actionGroup>
+</actionGroups>

app/code/Magento/Catalog/Test/Mftf/Section/AdminProductSEOSection.xml

@@ -12,6 +12,7 @@
         <element name="sectionHeader" type="button" selector="div[data-index='search-engine-optimization']" timeout="30"/>
         <element name="urlKeyInput" type="input" selector="input[name='product[url_key]']"/>
         <element name="useDefaultUrl" type="checkbox" selector="input[name='use_default[url_key]']"/>
+        <element name="urlKeyRedirectCheckbox" type="checkbox" selector="input[name='product[url_key_create_redirect]']"/>
         <element name="metaTitleInput" type="input" selector="input[name='product[meta_title]']"/>
         <element name="metaKeywordsInput" type="textarea" selector="textarea[name='product[meta_keyword]']"/>
         <element name="metaDescriptionInput" type="textarea" selector="textarea[name='product[meta_description]']"/>

app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCustomProductAttributeWithDropdownFieldTest.xml

@@ -94,8 +94,7 @@
         <scrollToTopOfPage stepKey="scrollToTopOfPage"/>
         <click selector="{{AdminCreateNewProductAttributeSection.saveAttribute}}" stepKey="clickOnSaveAttribute"/>
         <waitForPageLoad stepKey="waitForAttributeToSave"/>
-        <click selector="{{AdminProductFormSection.save}}" stepKey="saveTheProduct"/>
-        <waitForPageLoad stepKey="waitForProductToSave"/>
+        <actionGroup ref="AdminProductFormSaveButtonClickActionGroup" stepKey="saveTheProduct"/>
         <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the product." stepKey="messageYouSavedTheProductIsShown"/>
 
         <!--Verify product attribute added in product form -->

app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductAttributeFromProductPageTest.xml

@@ -86,8 +86,7 @@
         <scrollToTopOfPage stepKey="scrollToTopOfPage"/>
         <click selector="{{AdminCreateNewProductAttributeSection.saveAttribute}}" stepKey="clickOnSaveAttribute"/>
         <waitForPageLoad stepKey="waitForAttributeToSave"/>
-        <click selector="{{AdminProductFormSection.save}}" stepKey="saveTheProduct"/>
-        <waitForPageLoad stepKey="waitForProductToSave"/>
+        <actionGroup ref="AdminProductFormSaveButtonClickActionGroup" stepKey="saveTheProduct"/>
         <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the product." stepKey="messageYouSavedTheProductIsShown"/>
 
         <!--Run Re-Index task -->

app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductAttributeRequiredTextFieldTest.xml

@@ -74,8 +74,7 @@
         <scrollToTopOfPage stepKey="scrollToTopOfPage"/>
         <click selector="{{AdminCreateNewProductAttributeSection.saveAttribute}}" stepKey="clickOnSaveAttribute"/>
         <waitForPageLoad stepKey="waitForAttributeToSave"/>
-        <click selector="{{AdminProductFormSection.save}}" stepKey="saveTheProduct"/>
-        <waitForPageLoad stepKey="waitForProductToSave"/>
+        <actionGroup ref="AdminProductFormSaveButtonClickActionGroup" stepKey="saveTheProduct"/>
 
         <!--Verify product attribute added in product form and Is Required message displayed-->
         <scrollTo selector="{{AdminProductFormSection.contentTab}}" stepKey="scrollToContentTab"/>
@@ -85,8 +84,7 @@
         <!--Fill the Required field and save the product -->
         <fillField selector="{{AdminProductFormSection.attributeRequiredInput(newProductAttribute.attribute_code)}}" userInput="attribute" stepKey="fillTheAttributeRequiredInputField"/>
         <scrollToTopOfPage stepKey="scrollToTopOfProductFormPage"/>
-        <click selector="{{AdminProductFormSection.save}}" stepKey="saveTheProduct1"/>
-        <waitForPageLoad stepKey="waitForProductToSave1"/>
+        <actionGroup ref="AdminProductFormSaveButtonClickActionGroup" stepKey="saveTheProduct1"/>
         <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the product." stepKey="messageYouSavedTheProductIsShown"/>
     </test>
 </tests>

app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductWithCountryOfManufactureAttributeSKUMaskTest.xml

@@ -42,8 +42,7 @@
         <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="{{nameAndAttributeSkuMaskSimpleProduct.price}}" stepKey="fillSimpleProductPrice"/>
         <fillField selector="{{AdminProductFormSection.productWeight}}" userInput="{{nameAndAttributeSkuMaskSimpleProduct.weight}}" stepKey="fillSimpleProductWeight"/>
         <fillField selector="{{AdminProductFormSection.productQuantity}}" userInput="{{nameAndAttributeSkuMaskSimpleProduct.quantity}}" stepKey="fillSimpleProductQuantity"/>
-        <click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
-        <waitForPageLoad stepKey="waitForSimpleProductToSave"/>
+        <actionGroup ref="AdminProductFormSaveButtonClickActionGroup" stepKey="clickSaveButton"/>
         <!-- Verify customer see success message -->
         <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertSimpleProductSaveSuccessMessage"/>
 

app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductFillingRequiredFieldsOnlyTest.xml

@@ -34,8 +34,7 @@
         <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{virtualProductWithRequiredFields.name}}" stepKey="fillProductName"/>
         <fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{virtualProductWithRequiredFields.sku}}" stepKey="fillProductSku"/>
         <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="{{virtualProductWithRequiredFields.price}}" stepKey="fillProductPrice"/>
-        <click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
-        <waitForPageLoad stepKey="waitForVirtualProductSaved" />
+        <actionGroup ref="AdminProductFormSaveButtonClickActionGroup" stepKey="clickSaveButton"/>
 
         <!-- Verify we see success message -->
         <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertVirtualProductSuccessMessage"/>

app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductOutOfStockWithTierPriceTest.xml

@@ -61,8 +61,7 @@
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
         <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{virtualProductOutOfStock.urlKey}}" stepKey="fillUrlKey"/>
         <scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
-        <click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
-        <waitForPageLoad stepKey="waitForVirtualProductSaved"/>
+        <actionGroup ref="AdminProductFormSaveButtonClickActionGroup" stepKey="clickSaveButton"/>
 
         <!-- Verify we see success message -->
         <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertVirtualProductSuccessMessage"/>

app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithCustomOptionsSuiteAndImportOptionsTest.xml

@@ -111,8 +111,7 @@
         <selectOption selector="{{AdminProductCustomizableOptionsSection.clickSelectPriceType(virtualProductCustomizableOption4.title,'1')}}" userInput="{{virtualProductCustomizableOption4.option_1_price_type}}" stepKey="selectOptionPriceTypeForFourthDataSetSecondRow"/>
         <fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionValueSku(virtualProductCustomizableOption4.title,'1')}}" userInput="{{virtualProductCustomizableOption4.option_1_sku}}" stepKey="fillOptionSkuForFourthDataSetSecondRow"/>
         <scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
-        <click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
-        <waitForPageLoad stepKey="waitForVirtualProductSaved"/>
+        <actionGroup ref="AdminProductFormSaveButtonClickActionGroup" stepKey="clickSaveButton"/>
 
         <!-- Verify we see success message -->
         <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertVirtualProductSuccessMessage"/>

app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithTierPriceTest.xml

@@ -53,8 +53,7 @@
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
         <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{virtualProductBigQty.urlKey}}" stepKey="fillUrlKey"/>
         <scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
-        <click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
-        <waitForPageLoad stepKey="waitForVirtualProductSaved"/>
+        <actionGroup ref="AdminProductFormSaveButtonClickActionGroup" stepKey="clickSaveButton"/>
 
         <!-- Verify we see success message -->
         <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertVirtualProductSuccessMessage"/>

app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithoutManageStockTest.xml

@@ -51,8 +51,7 @@
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
         <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{virtualProductWithoutManageStock.urlKey}}" stepKey="fillUrlKey"/>
         <scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
-        <click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
-        <waitForPageLoad stepKey="waitForVirtualProductSaved"/>
+        <actionGroup ref="AdminProductFormSaveButtonClickActionGroup" stepKey="clickSaveButton"/>
 
         <!-- Verify we see success message -->
         <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertVirtualProductSuccessMessage"/>

app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteProductWithCustomOptionTest.xml

@@ -38,10 +38,9 @@
         <amOnPage url="{{StorefrontProductPage.url($$createSimpleProduct.name$$)}}" stepKey="amOnSimpleProductPage"/>
         <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="Whoops, our bad..." stepKey="seeWhoops"/>
         <!-- Search for the product by sku -->
-        <fillField selector="{{StorefrontQuickSearchSection.searchPhrase}}" userInput="$$createSimpleProduct.sku$$" stepKey="fillSearchBarByProductSku"/>
-        <waitForPageLoad stepKey="waitForSearchButton"/>
-        <click selector="{{StorefrontQuickSearchSection.searchButton}}" stepKey="clickSearchButton"/>
-        <waitForPageLoad stepKey="waitForSearchResults"/>
+        <actionGroup ref="StoreFrontQuickSearchActionGroup" stepKey="searchByCreatedTerm">
+            <argument name="query" value="$$createSimpleProduct.sku$$"/>
+        </actionGroup>
         <!-- Should not see any search results -->
         <dontSee userInput="$$createSimpleProduct.sku$$" selector="{{StorefrontCatalogSearchMainSection.searchResults}}" stepKey="dontSeeProduct"/>
         <see selector="{{StorefrontCatalogSearchMainSection.message}}" userInput="Your search returned no results." stepKey="seeCantFindProductOneMessage"/>

app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteSimpleProductTest.xml

@@ -37,10 +37,9 @@
         <amOnPage url="{{StorefrontProductPage.url($$createSimpleProduct.name$$)}}" stepKey="amOnSimpleProductPage"/>
         <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="Whoops, our bad..." stepKey="seeWhoops"/>
         <!-- Search for the product by sku -->
-        <fillField selector="{{StorefrontQuickSearchSection.searchPhrase}}" userInput="$$createSimpleProduct.sku$$" stepKey="fillSearchBarByProductSku"/>
-        <waitForPageLoad stepKey="waitForSearchButton"/>
-        <click selector="{{StorefrontQuickSearchSection.searchButton}}" stepKey="clickSearchButton"/>
-        <waitForPageLoad stepKey="waitForSearchResults"/>
+        <actionGroup ref="StoreFrontQuickSearchActionGroup" stepKey="searchByCreatedTerm">
+            <argument name="query" value="$$createSimpleProduct.sku$$"/>
+        </actionGroup>
         <!-- Should not see any search results -->
         <dontSee userInput="$$createSimpleProduct.sku$$" selector="{{StorefrontCatalogSearchMainSection.searchResults}}" stepKey="dontSeeProduct"/>
         <see selector="{{StorefrontCatalogSearchMainSection.message}}" userInput="Your search returned no results." stepKey="seeCantFindProductOneMessage"/>

app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteVirtualProductTest.xml

@@ -38,10 +38,9 @@
         <amOnPage url="{{StorefrontProductPage.url($$createVirtualProduct.name$$)}}" stepKey="amOnVirtualProductPage"/>
         <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="Whoops, our bad..." stepKey="seeWhoops"/>
         <!-- Search for the product by sku -->
-        <fillField selector="{{StorefrontQuickSearchSection.searchPhrase}}" userInput="$$createVirtualProduct.sku$$" stepKey="fillSearchBarByProductSku"/>
-        <waitForPageLoad stepKey="waitForSearchButton"/>
-        <click selector="{{StorefrontQuickSearchSection.searchButton}}" stepKey="clickSearchButton"/>
-        <waitForPageLoad stepKey="waitForSearchResults"/>
+        <actionGroup ref="StoreFrontQuickSearchActionGroup" stepKey="searchByCreatedTerm">
+            <argument name="query" value="$$createVirtualProduct.sku$$"/>
+        </actionGroup>
         <!-- Should not see any search results -->
         <dontSee userInput="$$createVirtualProduct.sku$$" selector="{{StorefrontCatalogSearchMainSection.searchResults}}" stepKey="dontSeeProduct"/>
         <see selector="{{StorefrontCatalogSearchMainSection.message}}" userInput="Your search returned no results." stepKey="seeCantFindProductOneMessage"/>

app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveProductBetweenCategoriesTest.xml

@@ -78,8 +78,7 @@
         <click selector="{{AdminProductFormSection.selectCategory(SimpleSubCategory.name)}}" stepKey="selectSub1Category"/>
         <click selector="{{AdminProductFormSection.done}}" stepKey="clickDone"/>
         <waitForPageLoad stepKey="waitForApplyCategory"/>
-        <click selector="{{AdminProductFormSection.save}}" stepKey="clickSave"/>
-        <waitForPageLoad stepKey="waitForSavingChanges"/>
+        <actionGroup ref="AdminProductFormSaveButtonClickActionGroup" stepKey="clickSave"/>
 
         <!-- Enable `Use Categories Path for Product URLs` on Stores -> Configuration -> Catalog -> Catalog -> Search Engine Optimization -->
         <amOnPage url="{{AdminCatalogSearchConfigurationPage.url}}" stepKey="onConfigPage"/>
@@ -109,8 +108,7 @@
         <checkOption selector="{{AdminProductFormSection.selectCategory($$createSecondCategory.name$$)}}" stepKey="selectCategory"/>
         <click selector="{{AdminProductFormSection.done}}" stepKey="pressButtonDone"/>
         <waitForPageLoad stepKey="waitForApplyCategory2"/>
-        <click selector="{{AdminProductFormSection.save}}" stepKey="pushButtonSave"/>
-        <waitForPageLoad stepKey="waitForSavingProduct"/>
+        <actionGroup ref="AdminProductFormSaveButtonClickActionGroup" stepKey="pushButtonSave"/>
 
         <!--Product is saved -->
         <see userInput="You saved the product." selector="{{CatalogProductsSection.messageSuccessSavedProduct}}" stepKey="seeSuccessMessage"/>
@@ -181,8 +179,7 @@
         <click selector="{{AdminProductFormSection.selectCategory({$grabNameSubCategory})}}" stepKey="selectSubCategory"/>
         <click selector="{{AdminProductFormSection.done}}" stepKey="clickButtonDone"/>
         <waitForPageLoad stepKey="waitForCategoryApply"/>
-        <click selector="{{AdminProductFormSection.save}}" stepKey="clickButtonSave"/>
-        <waitForPageLoad stepKey="waitForSaveChanges"/>
+        <actionGroup ref="AdminProductFormSaveButtonClickActionGroup" stepKey="clickButtonSave"/>
 
         <!-- Product is saved successfully -->
         <see userInput="You saved the product." selector="{{CatalogProductsSection.messageSuccessSavedProduct}}" stepKey="seeSaveMessage"/>