Merge remote-tracking branch 'origin/MC-33699' into 2.4-develop-php74-pr36

Author: zakdma

app/code/Magento/ConfigurableProduct/Test/Mftf/Test/NoOptionAvailableToConfigureDisabledProductTest.xml

@@ -154,19 +154,29 @@
         <click selector="{{AdminOrderFormItemsSection.addSelected}}" stepKey="clickToAddProductToOrder"/>
         <waitForPageLoad stepKey="waitForNewOrderPageLoad"/>
         <see userInput="This product is out of stock." stepKey="seeTheErrorMessageDisplayed"/>
+
+        <actionGroup ref="NavigateToNewOrderPageExistingCustomerActionGroup" stepKey="createNewOrderThirdTime">
+            <argument name="customer" value="$createCustomer$"/>
+        </actionGroup>
+        <actionGroup ref="AddSimpleProductToOrderActionGroup" stepKey="addThirdChildProductToOrder">
+            <argument name="product" value="$createConfigChildProduct3$"/>
+            <argument name="productQty" value="1"/>
+        </actionGroup>
+        <actionGroup ref="AssertAdminItemOrderedErrorNotVisibleActionGroup" stepKey="assertNoticeAbsent">
+            <argument name="productName" value="$createConfigChildProduct3.name$"/>
+            <argument name="messageType" value="notice"/>
+        </actionGroup>
+        <actionGroup ref="AssertAdminItemOrderedErrorNotVisibleActionGroup" stepKey="assertErrorAbsent">
+            <argument name="productName" value="$createConfigChildProduct3.name$"/>
+            <argument name="messageType" value="error"/>
+        </actionGroup>
         <!-- Select shipping method -->
         <comment userInput="Select shipping method" stepKey="selectShippingMethod"/>
         <click selector="{{AdminInvoicePaymentShippingSection.getShippingMethodAndRates}}" stepKey="openShippingMethod"/>
         <waitForPageLoad stepKey="waitForShippingMethods"/>
         <click selector="{{AdminInvoicePaymentShippingSection.shippingMethod}}" stepKey="chooseShippingMethod"/>
         <waitForPageLoad stepKey="waitForShippingMethodLoad"/>
         <click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="clickSubmitOrder"/>
-        <waitForPageLoad stepKey="waitForError"/>
-        <!-- Check that error remains -->
-        <actionGroup ref="AssertAdminItemOrderedErrorActionGroup" stepKey="assertProductErrorRemains">
-            <argument name="productName" value="$createConfigChildProduct2.name$"/>
-            <argument name="messageType" value="error"/>
-            <argument name="message" value="This product is out of stock."/>
-        </actionGroup>
+        <actionGroup ref="VerifyCreatedOrderInformationActionGroup" stepKey="checkOrderSuccessfullyCreated"/>
     </test>
 </tests>

app/code/Magento/Sales/Test/Mftf/ActionGroup/AddSimpleProductToOrderActionGroup.xml

@@ -25,6 +25,6 @@
         <fillField selector="{{AdminOrderFormItemsSection.rowQty('1')}}" userInput="{{productQty}}" stepKey="fillProductQty"/>
         <scrollTo selector="{{AdminOrderFormItemsSection.addSelected}}" x="0" y="-100" stepKey="scrollToAddSelectedButton"/>
         <click selector="{{AdminOrderFormItemsSection.addSelected}}" stepKey="clickAddSelectedProducts"/>
-        <wait time="5" stepKey="waitForOptionsToLoad"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForOptionsToLoad"/>
     </actionGroup>
 </actionGroups>

app/code/Magento/Sales/Test/Mftf/ActionGroup/AssertAdminItemOrderedErrorNotVisibleActionGroup.xml

@@ -17,5 +17,6 @@
             <argument name="message" defaultValue="The requested qty is not available" type="string"/>
         </arguments>
         <dontSee userInput="{{message}}" selector="{{AdminOrderFormItemsOrderedSection.productMessage(productName, messageType)}}" stepKey="assertItemErrorNotVisible"/>
+        <dontSee userInput="{{message}}" selector="{{AdminOrderFormMessagesSection.messageByType(messageType)}}" stepKey="assertOrderErrorNotVisible"/>
     </actionGroup>
 </actionGroups>

app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormMessagesSection.xml

@@ -11,5 +11,6 @@
     <section name="AdminOrderFormMessagesSection">
         <element name="success" type="text" selector="#order-message div.message-success"/>
         <element name="error" type="text" selector="#order-message div.message-error"/>
+        <element name="messageByType" type="text" selector="#order-message div.message-{{messageType}}" parameterized="true"/>
     </section>
 </sections>

app/code/Magento/Sales/Test/Mftf/Test/AdminAddSelectedProductToOrderTest.xml

@@ -70,9 +70,6 @@
             <argument name="productQty" value="1"/>
         </actionGroup>
         <!-- Check that error remains -->
-        <actionGroup ref="AssertAdminItemOrderedErrorActionGroup" stepKey="assertProductErrorRemains">
-            <argument name="productName" value="$simpleProduct.name$"/>
-            <argument name="messageType" value="error"/>
-        </actionGroup>
+        <see userInput="The requested qty is not available" stepKey="assertProductErrorRemains"/>
     </test>
 </tests>