MC-22083: MFTF tests stabilization - DisplayRefreshCacheAfterChangingCategoryPageLayoutTest MC-17031

Author: zakdma

app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminSaveCustomerAddressActionGroup.xml

@@ -9,6 +9,6 @@
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="AdminSaveCustomerAddressActionGroup">
         <click selector="{{StorefrontCustomerAddressFormSection.saveAddress}}" stepKey="saveCustomerAddress"/>
-        <see selector="{{AdminMessagesSection.success}}" userInput="You saved the address." stepKey="seeSuccessMessage"/>
+        <see selector="{{StorefrontMessagesSection.success}}" userInput="You saved the address." stepKey="seeSuccessMessage"/>
     </actionGroup>
 </actionGroups>

app/code/Magento/ImportExport/Test/Mftf/Test/AdminImportProductsWithDeleteBehaviorTest.xml

@@ -47,8 +47,8 @@
         <attachFile selector="{{AdminImportMainSection.selectFileToImport}}" userInput="catalog_products.csv" stepKey="attachFileForImport"/>
         <click selector="{{AdminImportHeaderSection.checkDataButton}}" stepKey="clickCheckDataButton"/>
         <click selector="{{AdminImportMainSection.importButton}}" stepKey="clickImportButton"/>
-        <see selector="{{AdminMessagesSection.success}}" userInput="Import successfully done" stepKey="assertSuccessMessage"/>
-        <see selector="{{AdminMessagesSection.notice}}" userInput="Created: 0, Updated: 0, Deleted: 3" stepKey="assertNotice"/>
+        <see selector="{{AdminImportValidationMessagesSection.success}}" userInput="Import successfully done" stepKey="assertSuccessMessage"/>
+        <see selector="{{AdminImportValidationMessagesSection.notice}}" userInput="Created: 0, Updated: 0, Deleted: 3" stepKey="assertNotice"/>
         <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchSimpleProductOnBackend">
             <argument name="product" value="$$createSimpleProduct$$"/>
         </actionGroup>

app/code/Magento/Sales/Test/Mftf/Page/AdminOrderCreatePage.xml

@@ -19,5 +19,6 @@
         <section name="AdminOrderFormTotalSection"/>
         <section name="AdminOrderFormStoreSelectorSection"/>
         <section name="AdminOrderFormDiscountSection"/>
+        <section name="AdminOrderFormMessagesSection"/>
     </page>
 </pages>

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

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <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"/>
+    </section>
+</sections>

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

@@ -57,7 +57,7 @@
         <!--Submit Order and verify that Order isn't placed-->
         <click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="clickSubmitOrder"/>
 
-        <dontSeeElement selector="{{AdminMessagesSection.success}}" stepKey="seeSuccessMessage"/>
-        <seeElement selector="{{AdminMessagesSection.error}}" stepKey="seeErrorMessage"/>
+        <dontSeeElement selector="{{AdminOrderFormMessagesSection.success}}" stepKey="seeSuccessMessage"/>
+        <seeElement selector="{{AdminOrderFormMessagesSection.error}}" stepKey="seeErrorMessage"/>
     </test>
 </tests>