🔃 [Magento Community Engineering] Community Contributions - 2.4-develop latest changes

Accepted Community Pull Requests:
 - #30223: [MFTF] add ReloadPageActionGroup (by @Usik2203)
 - #27674: Backend: focus search field when pressing forwardslash - '/' (by @vovayatsyuk)
 - #27972: ISSUE-27954: Forgot password save user only one column (by @sheepfy)
 - #26966: Passing arguments for queues as expected (by @bartoszkubicki)
 - #30359: MFTF: Admin Delete CMS Block Test (by @DmitryTsymbal)
 - #26401: Add Event Prefix And Object To The Catalog Product Option Value Collection (by @sprankhub)
 - #28147: Introduce separate BlockByIdentifier class to get Layout Block based on CMS Block Identifier (by @lbajsarowicz)


Fixed GitHub Issues:
 - #30683: [Issue] [MFTF] add ReloadPageActionGroup (reported by @m2-assistant[bot]) has been fixed in #30223 by @Usik2203 in 2.4-develop branch
   Related commits:
     1. 9713cde
     2. 52a288b
     3. 9de5f78
     4. bb7d50b
     5. 73951dd

 - #29551: [Issue] Backend: focus search field when pressing forwardslash - '/' (reported by @m2-assistant[bot]) has been fixed in #27674 by @vovayatsyuk in 2.4-develop branch
   Related commits:
     1. 73106d4
     2. b445058
     3. a17053a
     4. d033021
     5. 5021e2b
     6. 0d002e3
     7. a93afde
     8. 50d421d
     9. 3a19dca

 - #27954: Can't create/reset user password if user address is not valid (reported by @rafal-kos) has been fixed in #27972 by @sheepfy in 2.4-develop branch
   Related commits:
     1. 29621ba
     2. bc52285
     3. 4f8f9f2
     4. 09964ae
     5. b7d5fa5

 - #30216: [Issue] Passing arguments for queues as expected (reported by @m2-assistant[bot]) has been fixed in #26966 by @bartoszkubicki in 2.4-develop branch
   Related commits:
     1. e91a3f1
     2. 5ee0054
     3. 00a03e9
     4. d802328

 - #30372: [Issue] MFTF: Admin Delete CMS Block Test (reported by @m2-assistant[bot]) has been fixed in #30359 by @DmitryTsymbal in 2.4-develop branch
   Related commits:
     1. bebc574
     2. 5ba03c2

 - #29621: [Issue] Add Event Prefix And Object To The Catalog Product Option Value Collection (reported by @m2-assistant[bot]) has been fixed in #26401 by @sprankhub in 2.4-develop branch
   Related commits:
     1. 7185e16

 - #28309: [Issue] Introduce separate BlockByIdentifier class to get Layout Block based on CMS Block Identifier (reported by @m2-backlog[bot]) has been fixed in #28147 by @lbajsarowicz in 2.4-develop branch
   Related commits:
     1. a100d24
     2. 4501271
     3. ae11a0c
     4. 74b3e62
     5. 4656d9e
     6. 3e6bb4b
     7. ab2be56
     8. ac5ef07
     9. cdcad5c
     10. c3f7bed
     11. 00cd00a
     12. 5f3a2eb
     13. 56b10a1
     14. 6e2f90b
     15. 476a551
     16. d114bea
     17. 4ad1ade
     18. a851e7b

Author: gabrieldagama

app/code/Magento/Backend/Test/Mftf/Section/AdminHeaderSection.xml

@@ -11,6 +11,8 @@
     <section name="AdminHeaderSection">
         <element name="pageTitle" type="text" selector=".page-header h1.page-title"/>
         <element name="adminUserAccountText" type="text" selector=".page-header .admin-user-account-text" />
+        <element name="globalSearchInput" type="text" selector="#search-global" />
+        <element name="globalSearchInputVisible" type="text" selector=".search-global-field._active #search-global" />
         <!-- Legacy heading section. Mostly used for admin 404 and 403 pages -->
         <element name="pageHeading" type="text" selector=".page-content .page-heading"/>
         <!-- Used for page not found error -->

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

@@ -29,7 +29,7 @@
         <!-- 2. Wait for session to expire. -->
         <actionGroup ref="AdminLoginActionGroup" stepKey="LoginAsAdmin"/>
         <wait time="60" stepKey="waitForSessionLifetime"/>
-        <reloadPage stepKey="reloadPage"/>
+        <actionGroup ref="ReloadPageActionGroup" stepKey="reloadPage"/>
 
         <!-- 3. Perform asserts. -->
         <seeElement selector="{{AdminLoginFormSection.loginBlock}}" stepKey="assertAdminLoginPageIsAvailable"/>

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

@@ -40,7 +40,7 @@
             <argument name="Customer" value="$$createCustomer$$" />
         </actionGroup>
         <wait time="60" stepKey="waitForCookieLifetime"/>
-        <reloadPage stepKey="reloadPage"/>
+        <actionGroup ref="ReloadPageActionGroup" stepKey="reloadPage"/>
 
         <!-- 5. Perform asserts. -->
         <seeElement selector="{{StorefrontPanelHeaderSection.customerLoginLink}}" stepKey="assertAuthorizationLinkIsVisibleOnStoreFront"/>

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

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminSearchHotkeyTest">
+        <annotations>
+            <features value="Backend"/>
+            <stories value="Search form hotkey in backend"/>
+            <title value="Admin should be able focus on the search field with a hotkey"/>
+            <description value="Admin should be able focus on the search field with a hotkey - forwardslash"/>
+            <severity value="MINOR"/>
+            <group value="backend"/>
+            <group value="search"/>
+        </annotations>
+        <before>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
+        </after>
+
+        <pressKey selector="body" parameterArray="[/]" stepKey="pressForwardslashKey"/>
+        <seeElement selector="{{AdminHeaderSection.globalSearchInputVisible}}" stepKey="seeActiveGlobalSearchInput"/>
+        <seeInField userInput="" selector="{{AdminHeaderSection.globalSearchInput}}" stepKey="seeEmptyGlobalSearchInput"/>
+        <pressKey selector="{{AdminHeaderSection.globalSearchInput}}" parameterArray="[/]" stepKey="pressForwardslashKeyAgain"/>
+        <seeInField userInput="/" selector="{{AdminHeaderSection.globalSearchInput}}" stepKey="seeForwardSlashInGlobalSearchInput"/>
+    </test>
+</tests>

app/code/Magento/Captcha/Test/Mftf/Test/CaptchaFormsDisplayingTest/CaptchaWithDisabledGuestCheckoutTest.xml

@@ -46,8 +46,10 @@
         <waitForElementVisible selector="{{StorefrontCustomerSignInPopupFormSection.captchaField}}" stepKey="seeCaptchaField"/>
         <waitForElementVisible selector="{{StorefrontCustomerSignInPopupFormSection.captchaImg}}" stepKey="seeCaptchaImage"/>
         <waitForElementVisible selector="{{StorefrontCustomerSignInPopupFormSection.captchaReload}}" stepKey="seeCaptchaReloadButton"/>
-        <reloadPage stepKey="refreshPage"/>
-        <waitForPageLoad stepKey="waitForPageLoad2"/>
+
+        <actionGroup ref="ReloadPageActionGroup" stepKey="refreshPage"/>
+        <comment userInput="Replacing reload action and preserve Backward Compatibility" stepKey="waitForPageLoad2" />
+
         <actionGroup ref="StorefrontClickOnMiniCartActionGroup" stepKey="clickCart2"/>
         <click selector="{{StorefrontMinicartSection.goToCheckout}}" stepKey="goToCheckout2"/>
         <waitForElementVisible selector="{{StorefrontCustomerSignInPopupFormSection.email}}" stepKey="waitEmailFieldVisible2"/>

app/code/Magento/Catalog/Model/ResourceModel/Product/Option/Value/Collection.php

@@ -14,6 +14,20 @@
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
+    /**
+     * Name prefix of events that are dispatched by model
+     *
+     * @var string
+     */
+    protected $_eventPrefix = 'catalog_product_option_value_collection';
+
+    /**
+     * Name of event parameter
+     *
+     * @var string
+     */
+    protected $_eventObject = 'product_option_value_collection';
+
     /**
      * Resource initialization
      *

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

@@ -97,7 +97,7 @@
         <magentoCLI command="cron:run" stepKey="runCron"/>
 
         <!-- 5. Open category A on Storefront again -->
-        <reloadPage stepKey="reloadCategoryA"/>
+        <actionGroup ref="ReloadPageActionGroup" stepKey="reloadCategoryA"/>
 
         <!-- Category A displays product A1 now -->
         <see userInput="$$createCategoryA.name$$" selector="{{StorefrontCategoryMainSection.CategoryTitle}}" stepKey="seeTitleCategoryA1"/>
@@ -126,7 +126,7 @@
         <magentoCLI command="cron:run" stepKey="runCron1"/>
 
         <!-- 9. Open category A on Storefront again -->
-        <reloadPage stepKey="refreshCategoryAPage"/>
+        <actionGroup ref="ReloadPageActionGroup" stepKey="refreshCategoryAPage"/>
 
         <!-- Category A is empty now -->
         <see userInput="$$createCategoryA.name$$" selector="{{StorefrontCategoryMainSection.CategoryTitle}}" stepKey="seeOnPageCategoryAName"/>

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

@@ -40,8 +40,10 @@
 
         <!-- Assert single row - no hover state -->
         <createData entity="ApiCategoryA" stepKey="createFirstCategoryBlank"/>
-        <reloadPage stepKey="refreshPage"/>
-        <waitForPageLoad stepKey="waitForBlankSingleRowAppear"/>
+
+        <actionGroup ref="ReloadPageActionGroup" stepKey="refreshPage"/>
+        <comment userInput="Replacing reload action and preserve Backward Compatibility" stepKey="waitForBlankSingleRowAppear"/>
+
         <moveMouseOver selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createFirstCategoryBlank.name$$)}}" stepKey="hoverFirstCategoryBlank"/>
         <dontSeeElement selector="{{StorefrontNavigationMenuSection.subItemLevelHover('level0')}}" stepKey="assertNoHoverState"/>
 
@@ -87,8 +89,9 @@
         </createData>
 
         <!-- Several rows. Hover on category without children -->
-        <reloadPage stepKey="reloadPage"/>
-        <waitForPageLoad stepKey="waitForBlankSeveralRowsAppear"/>
+        <actionGroup ref="ReloadPageActionGroup" stepKey="reloadPage"/>
+        <comment userInput="Replacing reload action and preserve Backward Compatibility" stepKey="waitForBlankSeveralRowsAppear"/>
+
         <moveMouseOver selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategoryWithoutChildrenBlank.name$$)}}" stepKey="hoverCategoryWithoutChildren"/>
         <dontSeeElement selector="{{StorefrontNavigationMenuSection.itemByNameAndLevel($$createCategoryWithoutChildrenBlank.name$$, 'level0')}}" stepKey="dontSeeChildrenInCategory"/>
 
@@ -167,8 +170,9 @@
         <createData entity="ApiCategory" stepKey="createFourthCategoryLuma"/>
 
         <!-- Single row. No hover state -->
-        <reloadPage stepKey="reload"/>
-        <waitForPageLoad stepKey="waitForLumaSingleRowAppear"/>
+        <actionGroup ref="ReloadPageActionGroup" stepKey="reload"/>
+        <comment userInput="Replacing reload action and preserve Backward Compatibility" stepKey="waitForLumaSingleRowAppear"/>
+
         <dontSeeElement selector="{{StorefrontNavigationMenuSection.itemByNameAndLevel($$createFirstCategoryLuma.name$$, 'level0')}}" stepKey="noHoverStateInFirstCategory"/>
         <dontSeeElement selector="{{StorefrontNavigationMenuSection.itemByNameAndLevel($$createSecondCategoryLuma.name$$, 'level0')}}" stepKey="noHoverStateInSecondCategory"/>
         <dontSeeElement selector="{{StorefrontNavigationMenuSection.itemByNameAndLevel($$createThirdCategoryLuma.name$$, 'level0')}}" stepKey="noHoverStateThirdCategory"/>
@@ -203,8 +207,9 @@
         <createData entity="ApiCategory" stepKey="createEighthCategoryLuma"/>
 
         <!-- Several rows. Hover on Category without children -->
-        <reloadPage stepKey="refresh"/>
-        <waitForPageLoad stepKey="waitForLumaSeveralRowsAppear"/>
+        <actionGroup ref="ReloadPageActionGroup" stepKey="refresh"/>
+        <comment userInput="Replacing reload action and preserve Backward Compatibility" stepKey="waitForLumaSeveralRowsAppear"/>
+
         <moveMouseOver selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createFifthCategoryLuma.name$$)}}" stepKey="hoverOnCategoryWithoutChildren"/>
         <dontSeeElement selector="{{StorefrontNavigationMenuSection.itemByNameAndLevel($$createFifthCategoryLuma.name$$, 'level0')}}" stepKey="dontSeeSubcategoriesInCategory"/>
 

app/code/Magento/Checkout/Test/Mftf/Test/AddressStateFieldForUKCustomerRemainOptionAfterRefreshTest.xml

@@ -42,8 +42,8 @@
         <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="guestGoToCheckoutFromMinicart" />
         <selectOption stepKey="selectCounty" selector="{{CheckoutShippingSection.country}}" userInput="{{UK_Address.country_id}}"/>
         <waitForPageLoad stepKey="waitFormToReload"/>
-        <reloadPage stepKey="refreshPage"/>
-        <waitForPageLoad stepKey="waitFormToReload1"/>
+        <actionGroup ref="ReloadPageActionGroup" stepKey="refreshPage"/>
+        <comment userInput="Replacing reload action and preserve Backward Compatibility" stepKey="waitFormToReload1" />
         <fillField selector="{{CheckoutShippingSection.email}}" userInput="{{CustomerEntityOne.email}}" stepKey="enterEmail"/>
         <fillField selector="{{CheckoutShippingSection.firstName}}" userInput="{{CustomerEntityOne.firstname}}" stepKey="enterFirstName"/>
         <fillField selector="{{CheckoutShippingSection.lastName}}" userInput="{{CustomerEntityOne.lastname}}" stepKey="enterLastName"/>

app/code/Magento/Checkout/Test/Mftf/Test/AdminCheckConfigsChangesIsNotAffectedStartedCheckoutProcessTest.xml

@@ -90,8 +90,8 @@
 
         <!-- Back to the Checkout and refresh the page -->
         <switchToPreviousTab stepKey="switchToPreviousTab"/>
-        <reloadPage stepKey="refreshPage"/>
-        <waitForPageLoad stepKey="waitPageReload"/>
+        <actionGroup ref="ReloadPageActionGroup" stepKey="refreshPage"/>
+        <comment userInput="Replacing reload action and preserve Backward Compatibility" stepKey="waitPageReload"/>
 
         <!-- Payment step is opened after refreshing -->
         <waitForElement selector="{{CheckoutPaymentSection.paymentSectionTitle}}" stepKey="waitForPaymentSection"/>