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

Accepted Community Pull Requests:
 - #26273: MFTF: Replace <amOnPage> with <actionGroup> for Admin log out (by @lbajsarowicz)
 - #26274: MFTF: Replace incorrect URLs in Tests and ActionGroups (by @lbajsarowicz)
 - #26264: Issue 23521 (by @aleromano89)
 - #25946: Add plugin for SalesOrderItemRepository gift message (#19093) (by @lfolco)
 - #26268: Fix #14001 - M2.2.3 directory_country_region_name locale fix? 8bytes zh_Hans_CN(11bytes) ca_ES_VALENCIA(14bytes) (by @Bartlomiejsz)
 - #26259: Fix invalid XML Schema location (by @lbajsarowicz)
 - #26183: Added Fix for - 26181 (by @divyajyothi5321)
 - #26237: Added Fix for 25936 (by @divyajyothi5321)
 - #26234: [Align some space between input and update button Minicart] (by @hitesh-wagento)
 - #26215: Disabled the sorting option in status column on cache grid (by @srsathish92)
 - #26169: Added Fix for issue 26168 (by @divyajyothi5321)
 - #26029: Fixed keyboard arrow keys behavior for number fields in AdobeStock grid (by @rogyar)
 - #26207: #26206 Add information about currently reindexed index. (by @lbajsarowicz)


Fixed GitHub Issues:
 - #23521: Unable to run \Magento\Downloadable\Test\Unit\Helper\DownloadTest without internet connection / dns resolution (reported by @adrian-martinez-interactiv4) has been fixed in #26264 by @aleromano89 in 2.4-develop branch
   Related commits:
     1. 95fc06f
     2. b015b65
     3. 05ecfda

 - #19093: API: salesOrderItemRepository does not include gift message (reported by @nthurston) has been fixed in #25946 by @lfolco in 2.4-develop branch
   Related commits:
     1. 30b5818
     2. f076e55

 - #14001: M2.2.3 directory_country_region_name locale fix? 8bytes zh_Hans_CN(11bytes) ca_ES_VALENCIA(14bytes) (reported by @jiyun) has been fixed in #26268 by @Bartlomiejsz in 2.4-develop branch
   Related commits:
     1. 5fe7454

 - #26181: Out of stock text is not aligned properly with add to cart button at list page in responsive   (reported by @divyajyothi5321) has been fixed in #26183 by @divyajyothi5321 in 2.4-develop branch
   Related commits:
     1. e520c8b
     2. aaf1478
     3. b87672a
     4. 7117ac4
     5. 135df0b
     6. 6a7179a
     7. 4c545f2
     8. 3a7ec0d

 - #25936: Regular Price Label Alignment Issues in Frontend (reported by @divyajyothi5321) has been fixed in #26237 by @divyajyothi5321 in 2.4-develop branch
   Related commits:
     1. c39e85c

 - #26227: Need some space between input and update button Minicart (reported by @hitesh-wagento) has been fixed in #26234 by @hitesh-wagento in 2.4-develop branch
   Related commits:
     1. 69f6da0
     2. 7e5e6c7

 - #26208: Sorting issue for status column for Cache Management (reported by @hasim32) has been fixed in #26215 by @srsathish92 in 2.4-develop branch
   Related commits:
     1. e4e4b4e

 - #26168: Input Checkbox Alignment Issue at checkout page in Safari Browser (reported by @divyajyothi5321) has been fixed in #26169 by @divyajyothi5321 in 2.4-develop branch
   Related commits:
     1. 9882e96

 - #26206: Missing information about currently reindexed index on failure (reported by @lbajsarowicz) has been fixed in #26207 by @lbajsarowicz in 2.4-develop branch
   Related commits:
     1. 1ca03a3
     2. 79fe786
     3. 84b1310
     4. 80684d7
     5. 5bdadc0

Author: VladimirZaets

app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminLogoutActionGroup.xml

@@ -0,0 +1,14 @@
+<?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="AdminLogoutActionGroup">
+        <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+    </actionGroup>
+</actionGroups>

app/code/Magento/Backend/view/adminhtml/layout/adminhtml_cache_block.xml

@@ -80,6 +80,7 @@
                             <argument name="type" xsi:type="string">options</argument>
                             <argument name="width" xsi:type="string">120</argument>
                             <argument name="align" xsi:type="string">left</argument>
+                            <argument name="sortable" xsi:type="string">0</argument>
                             <argument name="options" xsi:type="array">
                                 <item name="disabled" xsi:type="array">
                                     <item name="value" xsi:type="string">0</item>

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

@@ -79,7 +79,7 @@
         <waitForPageLoad stepKey="waitForElementAdded"/>
 
         <!-- Go to the shopping cart page and grab the value of the option title -->
-        <amOnPage url="/checkout/cart/" stepKey="onPageShoppingCart"/>
+        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="onPageShoppingCart"/>
         <waitForPageLoad stepKey="waitForCartPageLoad"/>
         <grabTextFrom selector="{{CheckoutCartProductSection.nthBundleOptionName('1')}}" stepKey="grabTotalBefore"/>
 
@@ -100,7 +100,7 @@
         <see stepKey="assertSuccess2" selector="{{AdminProductMessagesSection.successMessage}}" userInput="You saved the product."/>
 
         <!-- Go to the shopping cart page and make sure the title has changed -->
-        <amOnPage url="/checkout/cart/" stepKey="onPageShoppingCart1"/>
+        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="onPageShoppingCart1"/>
         <waitForPageLoad stepKey="waitForCartPageLoad1"/>
         <grabTextFrom selector="{{CheckoutCartProductSection.nthBundleOptionName('1')}}" stepKey="grabTotalAfter"/>
         <assertNotEquals expected="{$grabTotalBefore}" expectedType="string" actual="{$grabTotalAfter}" actualType="string"  stepKey="assertNotEquals"/>

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

@@ -86,7 +86,7 @@
         <waitForPageLoad stepKey="waitForElementAdded2"/>
 
         <!-- Go to the shopping cart page and edit the first product -->
-        <amOnPage url="/checkout/cart/" stepKey="onPageShoppingCart"/>
+        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="onPageShoppingCart"/>
         <waitForPageLoad stepKey="waitForCartPageLoad"/>
         <waitForElementVisible stepKey="waitForInfoDropdown" selector="{{CheckoutCartSummarySection.total}}"/>
         <waitForPageLoad stepKey="waitForCartPageLoad3"/>
@@ -104,7 +104,7 @@
         <waitForPageLoad stepKey="waitForElementAdded3"/>
 
         <!-- Go to the shopping cart page -->
-        <amOnPage url="/checkout/cart/" stepKey="onPageShoppingCart2"/>
+        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="onPageShoppingCart2"/>
         <waitForPageLoad stepKey="waitForCartPageLoad2"/>
 
         <!-- Assert that the options are both there and the proce no longer matches -->

app/code/Magento/Captcha/Test/Mftf/Section/CaptchaFormsDisplayingSection.xml

@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="CaptchaFormsDisplayingSection">
         <element name="store" type="button" selector="#menu-magento-backend-stores"/>
         <element name="config" type="button" selector="//li[@data-ui-id='menu-magento-config-system-config']//span"/>

app/code/Magento/Catalog/Test/Mftf/Metadata/image_content-meta.xml

@@ -7,7 +7,7 @@
 -->
 
 <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
+            xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
     <operation name="CreateImageContent" dataType="ImageContent" type="create">
         <field key="base64_encoded_data" required="true">string</field>
         <field key="type" required="true">string</field>

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

@@ -60,7 +60,7 @@
         <seeElement selector="{{StorefrontCategoryProductSection.productPriceFinal('90')}}" stepKey="assertProductFinalPriceIs90_1"/>
         <seeElement selector="{{StorefrontCategoryProductSection.productPriceLabel('Regular Price')}}" stepKey="assertRegularPriceLabel_1"/>
         <seeElement selector="{{StorefrontCategoryProductSection.productPriceOld('100')}}" stepKey="assertRegularPriceAmount_1"/>
-        <amOnPage url="customer/account/logout/" stepKey="logoutCustomer1"/>
+        <amOnPage url="{{StorefrontCustomerLogoutPage.url}}" stepKey="logoutCustomer1"/>
         <waitForPageLoad  time="30" stepKey="waitForPageLoad2"/>
         <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="navigateToCategoryPage2"/>
         <waitForPageLoad time="30" stepKey="waitForPageLoad3"/>
@@ -116,7 +116,7 @@
         <seeElement selector="{{StorefrontCategoryProductSection.productPriceFinal('100')}}" stepKey="assertProductFinalPriceIs100_2"/>
         <seeElement selector="{{StorefrontCategoryProductSection.productPriceLabel('As low as')}}" stepKey="assertAsLowAsPriceLabel_1"/>
         <seeElement selector="{{StorefrontCategoryProductSection.productPriceLinkAfterLabel('As low as', '82')}}" stepKey="assertPriceAfterAsLowAsLabel_1"/>
-        <amOnPage url="customer/account/logout/" stepKey="logoutCustomer2"/>
+        <amOnPage url="{{StorefrontCustomerLogoutPage.url}}" stepKey="logoutCustomer2"/>
         <waitForPageLoad  time="30" stepKey="waitForPageLoad7"/>
         <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="navigateToCategoryPage6"/>
         <waitForPageLoad time="30" stepKey="waitForPageLoad8"/>

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

@@ -115,7 +115,7 @@
         <click selector="{{CatalogProductsSection.resetFilter}}" stepKey="clickOnResetFilter"/>
         <waitForPageLoad stepKey="waitForPageToLoad3"/>
         <selectOption selector="{{AdminProductGridFilterSection.productPerPage}}" userInput="30" stepKey="selectPagePerView"/>
-        <wait stepKey="waitFroPageToLoad1" time="30"/>
+        <waitForPageLoad stepKey="waitForPageToLoadProductPerPage" time="30"/>
         <fillField selector="{{AdminCategoryContentSection.productTableColumnName}}" userInput="pagi"  stepKey="selectProduct1"/>
         <click selector="{{AdminCategoryContentSection.productSearch}}" stepKey="clickSearchButton"/>
         <waitForPageLoad stepKey="waitFroPageToLoad2"/>

app/code/Magento/CatalogRuleConfigurable/Test/Mftf/Test/AdminApplyCatalogRuleForConfigurableProductWithAssignedSimpleProductsTest.xml

@@ -258,7 +258,7 @@
         </actionGroup>
 
         <!--Assert products prices in the cart -->
-        <amOnPage url="/checkout/cart/" stepKey="amOnShoppingCartPage"/>
+        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="amOnShoppingCartPage"/>
         <waitForPageLoad stepKey="waitForShoppingCartPageLoad"/>
         <see userInput="$210.69" selector="{{CheckoutCartProductSection.ProductPriceByOption($$createFirstConfigProductAttributeFirstOption.option[store_labels][1][label]$$)}}" stepKey="assertFirstProductPriceForFirstProductOption"/>
         <see userInput="$120.70" selector="{{CheckoutCartProductSection.ProductPriceByOption($$createFirstConfigProductAttributeSecondOption.option[store_labels][1][label]$$)}}" stepKey="assertFirstProductPriceForSecondProductOption"/>

app/code/Magento/CatalogRuleConfigurable/Test/Mftf/Test/AdminApplyCatalogRuleForConfigurableProductWithOptionsTest.xml

@@ -212,7 +212,7 @@
         </actionGroup>
 
         <!--Assert product price in the cart -->
-        <amOnPage url="/checkout/cart/" stepKey="amOnShoppingCartPage"/>
+        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="amOnShoppingCartPage"/>
         <waitForPageLoad stepKey="waitForShoppingCartPageLoad"/>
         <see userInput="{{CatalogRuleToFixed.discount_amount}}" selector="{{CheckoutCartProductSection.ProductPriceByOption($$createConfigProductAttributeFirstOption.option[store_labels][1][label]$$)}}" stepKey="assertProductPriceForFirstProductOption"/>
         <see userInput="$110.70" selector="{{CheckoutCartProductSection.ProductPriceByOption($$createConfigProductAttributeSecondOption.option[store_labels][1][label]$$)}}" stepKey="assertProductPriceForSecondProductOption"/>