Merge remote-tracking branch 'origin/MAGETWO-95901' into 2.2-develop-pr50

Author: zakdma

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

@@ -129,6 +129,8 @@
         <waitForPageLoad stepKey="waitForCategoryPageLoad1"/>
         <click selector="{{AdminCategoryMainActionsSection.categoryStoreViewOption('Default Store View')}}"
                stepKey="clickStoreView"/>
+        <waitForElementVisible selector="{{AdminCategoryMainActionsSection.categoryStoreViewModalAccept}}"
+                               stepKey="waitForPopup1"/>
         <click selector="{{AdminCategoryMainActionsSection.categoryStoreViewModalAccept}}" stepKey="clickActionAccept"/>
         <waitForPageLoad stepKey="waitForCategoryPageLoad2"/>
         <click selector="{{AdminCategoryProductsSection.sectionHeader}}" stepKey="openProductSection1"/>
@@ -148,6 +150,8 @@
         <waitForPageLoad stepKey="waitForCategoryPageLoad3"/>
         <click selector="{{AdminCategoryMainActionsSection.categoryStoreViewOption(secondStore.name)}}"
                stepKey="clickStoreView1"/>
+        <waitForElementVisible selector="{{AdminCategoryMainActionsSection.categoryStoreViewModalAccept}}"
+               stepKey="waitForPopup2"/>
         <click selector="{{AdminCategoryMainActionsSection.categoryStoreViewModalAccept}}"
                stepKey="clickActionAccept1"/>
         <waitForPageLoad stepKey="waitForCategoryPageLoad4"/>

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

@@ -120,6 +120,7 @@
 
         <amOnPage url="{{AdminOrdersPage.url}}" stepKey="onOrdersPage"/>
         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask3"/>
+        <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearGridFilter"/>
         <fillField selector="{{OrdersGridSection.search}}" userInput="{$grabOrderNumber}" stepKey="fillOrderNum"/>
         <click selector="{{OrdersGridSection.submitSearch}}" stepKey="submitSearch"/>
         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask4"/>
@@ -176,4 +177,4 @@
         <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
         <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
     </test>
-</tests>
+</tests>

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

@@ -65,6 +65,7 @@
         <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
         <amOnPage url="{{AdminOrdersPage.url}}" stepKey="onOrdersPage"/>
         <waitForPageLoad stepKey="waitForPageLoad1"/>
+        <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearGridFilter"/>
         <fillField selector="{{AdminOrdersGridSection.search}}" userInput="{$grabOrderNumber}" stepKey="fillOrderNum"/>
         <click selector="{{AdminOrdersGridSection.submitSearch}}" stepKey="submitSearchOrderNum"/>
         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappearOnSearch"/>

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

@@ -63,6 +63,7 @@
 
         <amOnPage url="{{AdminOrdersPage.url}}" stepKey="onOrdersPage"/>
         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappearOnOrdersPage"/>
+        <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearGridFilter"/>
         <fillField selector="{{OrdersGridSection.search}}" userInput="{$grabOrderNumber}" stepKey="fillOrderNum"/>
         <click selector="{{OrdersGridSection.submitSearch}}" stepKey="submitSearchOrderNum"/>
         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappearOnSearch"/>

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

@@ -61,6 +61,7 @@
 
         <amOnPage url="{{AdminOrdersPage.url}}" stepKey="onAdminOrdersPage"/>
         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask3"/>
+        <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearGridFilter"/>
         <fillField selector="{{OrdersGridSection.search}}" userInput="{$grabOrderNumber}" stepKey="searchOrderNum"/>
         <click selector="{{OrdersGridSection.submitSearch}}" stepKey="submitSearch"/>
         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask4"/>