Merge branch '2.4-develop' of https://github.com/magento-l3/magento2ce into ACP2E-2204

Author: aplapana

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

@@ -45,12 +45,12 @@
             <argument name="keyword" value="api-simple-product"/>
         </actionGroup>
 
-        <actionGroup ref="AdminCheckProductByIdOnProductGridActionGroup" stepKey="clickCheckbox1">
-            <argument name="productId" value="$$createProductOne.id$$"/>
+        <actionGroup ref="AdminCheckProductOnProductGridActionGroup" stepKey="clickCheckbox1">
+            <argument name="product" value="$createProductOne$"/>
         </actionGroup>
 
-        <actionGroup ref="AdminCheckProductByIdOnProductGridActionGroup" stepKey="clickCheckbox2">
-            <argument name="productId" value="$$createProductTwo.id$$"/>
+        <actionGroup ref="AdminCheckProductOnProductGridActionGroup" stepKey="clickCheckbox2">
+            <argument name="product" value="$createProductTwo$"/>
         </actionGroup>
 
         <actionGroup ref="AdminClickMassUpdateProductAttributesActionGroup" stepKey="clickDropdown"/>

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

@@ -125,7 +125,7 @@
         <!-- Assert Shipping total is not yet calculated -->
         <actionGroup ref="AssertStorefrontNotCalculatedValueInShippingTotalInOrderSummaryActionGroup" stepKey="assertNotYetCalculated"/>
 
-        <!--  Assert order cannot be placed and error message will shown. -->
+        <!--  Assert order cannot be placed and error message will be shown. -->
         <actionGroup ref="AssertStorefrontOrderIsNotPlacedActionGroup" stepKey="assertOrderCannotBePlaced">
             <argument name="error" value="The shipping method is missing. Select the shipping method and try again."/>
         </actionGroup>
@@ -144,7 +144,7 @@
         <!-- Place order assert succeed -->
         <actionGroup ref="ClickPlaceOrderActionGroup" stepKey="checkoutPlaceOrder"/>
 
-        <!-- Loged in Customer Test Scenario -->
+        <!-- Logged in Customer Test Scenario -->
         <!-- Login with created Customer -->
         <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginAsCustomer">
             <argument name="Customer" value="$$createCustomer$$"/>

app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/GenerateConfigurationsByAttributeCodeActionGroup.xml

@@ -15,7 +15,7 @@
         <arguments>
             <argument name="attributeCode" type="string" defaultValue="SomeString"/>
         </arguments>
-
+        <waitForElementClickable selector="{{AdminProductFormConfigurationsSection.createConfigurations}}" stepKey="waitForCreateConfigurationsButtonToBeClickable"/>
         <click selector="{{AdminProductFormConfigurationsSection.createConfigurations}}" stepKey="clickCreateConfigurations"/>
         <click selector="{{AdminCreateProductConfigurationsPanel.filters}}" stepKey="clickFilters"/>
         <fillField selector="{{AdminCreateProductConfigurationsPanel.attributeCode}}" userInput="{{attributeCode}}" stepKey="fillFilterAttributeCodeField"/>