Merge remote-tracking branch 'origin/2.4-develop' into MC-37761

yelahin-serhiy · yelahin-serhiy · commit 40542aafe127 · 2020-09-25T17:15:58.000+03:00
diff --git a/app/code/Magento/Backend/Test/Mftf/Test/AdminMenuNavigationWithSecretKeysTest.xml b/app/code/Magento/Backend/Test/Mftf/Test/AdminMenuNavigationWithSecretKeysTest.xml
@@ -35,18 +35,21 @@
 
         <click selector="{{AdminMenuSection.stores}}" stepKey="clickStoresMenuOption1"/>
         <waitForLoadingMaskToDisappear stepKey="waitForStoresMenu1" />
+        <waitForElementVisible selector="{{AdminMenuSection.configuration}}" stepKey="waitForConfigurationVisible1"/>
         <click selector="{{AdminMenuSection.configuration}}" stepKey="clickStoresConfigurationMenuOption1"/>
         <waitForPageLoad stepKey="waitForConfigurationPageLoad1"/>
         <seeCurrentUrlMatches regex="~\/admin\/system_config\/~" stepKey="seeCurrentUrlMatchesConfigPath1"/>
 
         <click selector="{{AdminMenuSection.catalog}}" stepKey="clickCatalogMenuOption"/>
         <waitForLoadingMaskToDisappear stepKey="waitForCatalogMenu1" />
+        <waitForElementVisible selector="{{AdminMenuSection.catalogProducts}}" stepKey="waitForCatalogProductsVisible"/>
         <click selector="{{AdminMenuSection.catalogProducts}}" stepKey="clickCatalogProductsMenuOption"/>
         <waitForPageLoad stepKey="waitForProductsPageLoad"/>
         <seeCurrentUrlMatches regex="~\/catalog\/product\/~" stepKey="seeCurrentUrlMatchesProductsPath"/>
 
         <click selector="{{AdminMenuSection.stores}}" stepKey="clickStoresMenuOption2"/>
         <waitForLoadingMaskToDisappear stepKey="waitForStoresMenu2" />
+        <waitForElementVisible selector="{{AdminMenuSection.configuration}}" stepKey="waitForConfigurationVisible2"/>
         <click selector="{{AdminMenuSection.configuration}}" stepKey="clickStoresConfigurationMenuOption2"/>
         <waitForPageLoad stepKey="waitForConfigurationPageLoad2"/>
         <seeCurrentUrlMatches regex="~\/admin\/system_config\/~" stepKey="seeCurrentUrlMatchesConfigPath2"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCreateAttributeFromProductPageActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCreateAttributeFromProductPageActionGroup.xml
@@ -18,8 +18,9 @@
         </arguments>
 
         <click selector="{{AdminProductFormSection.addAttributeBtn}}" stepKey="clickAddAttributeBtn"/>
-        <see userInput="Select Attribute" stepKey="checkNewAttributePopUpAppeared"/>
+        <waitForText userInput="Select Attribute" stepKey="checkNewAttributePopUpAppeared"/>
         <click selector="{{AdminProductFormAttributeSection.createNewAttribute}}" stepKey="clickCreateNewAttribute"/>
+        <waitForElementVisible selector="{{AdminProductFormNewAttributeSection.attributeLabel}}" stepKey="waitForAttrLabel" />
         <fillField selector="{{AdminProductFormNewAttributeSection.attributeLabel}}" userInput="{{attributeName}}" stepKey="fillAttributeLabel"/>
         <selectOption selector="{{AdminProductFormNewAttributeSection.attributeType}}" userInput="{{attributeType}}" stepKey="selectAttributeType"/>
         <click selector="{{AdminProductFormNewAttributeSection.saveAttribute}}" stepKey="saveAttribute"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontAddCategoryProductToCartWithQuantityActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontAddCategoryProductToCartWithQuantityActionGroup.xml
@@ -26,6 +26,8 @@
         <waitForText userInput="{{checkQuantity}}" selector="{{StorefrontMinicartSection.productCount}}" time="30" stepKey="assertProductCount"/>
         <conditionalClick selector="{{StorefrontMinicartSection.showCart}}" dependentSelector="{{StorefrontMinicartSection.miniCartOpened}}" visible="false" stepKey="openMiniCart"/>
         <waitForElementVisible selector="{{StorefrontMinicartSection.viewAndEditCart}}" stepKey="waitForViewAndEditCartVisible"/>
+        <doubleClick selector="{{StorefrontMinicartSection.itemQuantity(product.name)}}" stepKey="doubleClickOnQtyInput"/>
+        <pressKey selector="{{StorefrontMinicartSection.itemQuantity(product.name)}}" parameterArray="[\Facebook\WebDriver\WebDriverKeys::DELETE]" stepKey="clearQty"/>
         <fillField selector="{{StorefrontMinicartSection.itemQuantity(product.name)}}" userInput="{{quantity}}" stepKey="setProductQtyToFiftyInMiniCart"/>
         <click selector="{{StorefrontMinicartSection.itemQuantityUpdate(product.name)}}" stepKey="updateQtyInMiniCart"/>
     </actionGroup>
diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontOpenCartFromMinicartActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontOpenCartFromMinicartActionGroup.xml
@@ -13,6 +13,7 @@
             <description>Clicks on the Storefront Mini Shopping Cart icon. Click on 'View and Edit Cart'.</description>
         </annotations>
 
+        <scrollToTopOfPage stepKey="scrollToTopOfThePage" />
         <waitForElement selector="{{StorefrontMinicartSection.showCart}}" stepKey="waitForShowMinicart"/>
         <waitForElement selector="{{StorefrontMinicartSection.viewAndEditCart}}" stepKey="waitForCartLink"/>
         <click selector="{{StorefrontMinicartSection.showCart}}" stepKey="clickShowMinicart"/>
diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminCmsPageMassActionTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminCmsPageMassActionTest.xml
@@ -28,6 +28,8 @@
         <after>
             <deleteData createDataKey="firstCMSPage" stepKey="deleteFirstCMSPage" />
             <deleteData createDataKey="secondCMSPage" stepKey="deleteSecondCMSPage" />
+            <actionGroup ref="AdminOpenCMSPagesGridActionGroup" stepKey="navigateToCMSPageGrid"/>
+            <actionGroup ref="AdminGridFilterResetActionGroup" stepKey="clearPossibleGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
 
diff --git a/app/code/Magento/Cms/Test/Mftf/Test/CheckOrderOfProdsInWidgetOnCMSPageTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/CheckOrderOfProdsInWidgetOnCMSPageTest.xml
@@ -102,6 +102,7 @@
         <actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage2">
             <argument name="CMSPage" value="$$createCMSPage$$"/>
         </actionGroup>
+        <scrollTo stepKey="scrollToContent" selector="{{CmsNewPagePageContentSection.header}}"  x="0" y="-80"/>
         <conditionalClick selector="{{CmsNewPagePageContentSection.header}}"
                           dependentSelector="{{CmsNewPagePageContentSection.header}}._show" visible="false"
                           stepKey="clickContentTab2"/>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/NoOptionAvailableToConfigureDisabledProductTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/NoOptionAvailableToConfigureDisabledProductTest.xml
@@ -135,7 +135,8 @@
         <click selector="{{AdminOrderFormConfigureProductSection.configure($$createConfigProduct.id$$)}}" stepKey="clickOnConfigure"/>
         <!-- Click on attribute drop-down and check no option 1 is available -->
         <comment userInput="Click on attribute drop-down and check no option 1 is available" stepKey="commentNoOptionIsAvailable"/>
-        <waitForElement selector="{{AdminOrderFormConfigureProductSection.selectOption}}" stepKey="waitForShippingSectionLoaded"/>
+        <waitForPageLoad stepKey="waitForConfigure"/>
+        <waitForElementVisible selector="{{AdminOrderFormConfigureProductSection.selectOption}}" stepKey="waitForShippingSectionLoaded"/>
         <click selector="{{AdminOrderFormConfigureProductSection.selectOption}}" stepKey="clickToSelectOption"/>
         <dontSee userInput="$$createConfigProductAttributeOption1.option[store_labels][1][label]$$" stepKey="dontSeeOption1"/>
         <!-- Go to created customer page again -->
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminGridSelectAllOnPageTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminGridSelectAllOnPageTest.xml
@@ -32,6 +32,7 @@
         </after>
         <amOnPage url="{{AdminCustomerPage.url}}" stepKey="openCustomerPage"/>
         <!-- Select all from dropdown -->
+        <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearFilters" />
         <actionGroup ref="AdminGridSelectAllActionGroup" stepKey="selectAllCustomers"/>
         <!-- Deselect third customer -->
         <click selector="{{AdminCustomerGridMainActionsSection.customerCheckbox(($$thirdCustomer.email$$)}}" stepKey="selectThirdCustomer"/>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryAssertImagesDeletedInBulkActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryAssertImagesDeletedInBulkActionGroup.xml
@@ -15,6 +15,6 @@
         <arguments>
             <argument name="numberOfAssetsDeleted" type="string"/>
         </arguments>
-        <see userInput='{{numberOfAssetsDeleted}} assets have been successfully deleted.' stepKey="verifyDeleteImages"/>
+        <waitForText userInput='{{numberOfAssetsDeleted}} assets have been successfully deleted.' stepKey="verifyDeleteImages"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryAssertMassActionModeDetailsActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryAssertMassActionModeDetailsActionGroup.xml
@@ -15,7 +15,7 @@
         <arguments>
             <argument name="imageName" type="string"/>
         </arguments>
-        <click selector="{{AdminEnhancedMediaGalleryMassActionSection.massActionCheckbox(imageName)}}" stepKey="selectImageInGridToDelte"/>
-        <see selector="{{AdminEnhancedMediaGalleryMassActionSection.totalSelected}}" userInput="(1 Selected)" stepKey="verifySelectedCount"/>
+        <checkOption selector="{{AdminEnhancedMediaGalleryMassActionSection.massActionCheckbox(imageName)}}" stepKey="selectImageInGridToDelte"/>
+        <waitForText selector="{{AdminEnhancedMediaGalleryMassActionSection.totalSelected}}" userInput="(1 Selected)" stepKey="verifySelectedCount"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryEnableMassActionModeActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryEnableMassActionModeActionGroup.xml
@@ -13,7 +13,10 @@
             <description>Activate massaction mode by click on Delete Selected..</description>
         </annotations>
 
+        <wait stepKey="waitBefore" time="5" />
         <waitForElementVisible selector="{{AdminEnhancedMediaGalleryMassActionSection.deleteImages}}" stepKey="waitForMassActionButton"/>
         <click selector="{{AdminEnhancedMediaGalleryMassActionSection.deleteImages}}" stepKey="clickOnMassActionButton"/>
+        <waitForPageLoad stepKey="waitForPageLoaded" />
+        <wait stepKey="waitAfter" time="5" />
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Review/Test/Mftf/Test/AdminReviewsByProductsReportTest.xml b/app/code/Magento/Review/Test/Mftf/Test/AdminReviewsByProductsReportTest.xml
@@ -16,6 +16,9 @@
             <description value="Review By Products Grid Filters"/>
             <severity value="AVERAGE"/>
             <testCaseId value="MC-32333"/>
+            <skip>
+                <issueId value="MQE-2288" />
+            </skip>
         </annotations>
         <before>
             <!--Login-->
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/SalesOrderPrintSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/SalesOrderPrintSection.xml
@@ -9,6 +9,6 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="SalesOrderPrintSection">
-        <element name="isOrderPrintPage" type="block" selector=".preview-area"/>
+        <element name="isOrderPrintPage" type="block" selector="print-preview-app"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/StorefrontPrintOrderGuestTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/StorefrontPrintOrderGuestTest.xml
@@ -17,6 +17,9 @@
             <testCaseId value="MC-16225"/>
             <group value="sales"/>
             <group value="mtf_migrated"/>
+            <skip>
+                <issueId value="MQE-2288" />
+            </skip>
         </annotations>
         <before>
             <magentoCLI command="downloadable:domains:add" arguments="example.com static.magento.com" stepKey="addDownloadableDomain"/>
@@ -262,8 +265,11 @@
 
         <!--  Click on the "Print Order" button -->
         <click selector="{{StorefrontGuestOrderViewSection.printOrder}}" stepKey="printOrder"/>
+        <wait time="5" stepKey="waitForPrintWindowToOpen" />
         <switchToWindow stepKey="switchToWindow"/>
+        <wait time="5" stepKey="waitForPrintTabToOpen" />
         <switchToNextTab stepKey="switchToTab"/>
+        <wait stepKey="waitForPrintPreviewToLoad" time="5" />
         <seeInCurrentUrl url="sales/guest/print/order_id/" stepKey="seePrintPage"/>
 
         <!-- AssertSalesPrintOrderProducts -->
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/StorefrontRedirectToOrderHistoryTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/StorefrontRedirectToOrderHistoryTest.xml
@@ -18,6 +18,9 @@
             <severity value="MAJOR"/>
             <testCaseId value="MAGETWO-92854"/>
             <group value="sales"/>
+            <skip>
+                <issueId value="MQE-2288" />
+            </skip>
         </annotations>
         <before>
             <createData entity="_defaultCategory" stepKey="createCategory"/>
@@ -46,15 +49,25 @@
 
         <!--Go to 'print order' page by grabbed order id-->
         <grabFromCurrentUrl regex="~/order_id/(\d+)/~" stepKey="grabOrderIdFromURL"/>
-        <switchToNextTab stepKey="switchToPrintPage"/>
+        <wait time="5" stepKey="waitForPrintWindowToOpen" />
+        <switchToWindow stepKey="switchToPrintPage"/>
         <waitForElement selector="{{SalesOrderPrintSection.isOrderPrintPage}}" stepKey="checkPrintPage"/>
         <openNewTab stepKey="openNewTab"/>
+        <wait time="5" stepKey="waitForNewTabToOpen" />
         <switchToNextTab stepKey="switchForward"/>
+        <waitForElement selector="body" stepKey="waitForNewTab3HTML" />
         <amOnPage url="{{StorefrontSalesOrderPrintPage.url({$grabOrderIdFromURL})}}" stepKey="duplicatePrintPage"/>
 
+        <wait time="5" stepKey="waitForDuplicatePrintWindowToOpen" />
+        <switchToWindow stepKey="switchToDuplicatePrintPage"/>
+        <waitForElement selector="{{SalesOrderPrintSection.isOrderPrintPage}}" stepKey="checkDuplicatePrintPage"/>
+
         <!--Log out as customer 1-->
-        <switchToNextTab stepKey="switchForward2"/>
         <openNewTab stepKey="openNewTab2"/>
+        <wait time="5" stepKey="waitForNewTabToOpen1" />
+        <switchToNextTab stepKey="switchForward2"/>
+        <waitForElement selector="body" stepKey="waitForNewTab2HTML" />
+
         <amOnPage url="{{StorefrontCustomerSignOutPage.url}}" stepKey="signOut"/>
         <waitForLoadingMaskToDisappear stepKey="waitSignOutPage"/>
 
@@ -69,10 +82,14 @@
         </actionGroup>
 
         <!--Try to load 'print order' page with not relevant order id to be redirected to 'order history' page-->
-        <switchToNextTab stepKey="switchToPrintPage2"/>
+        <wait time="5" stepKey="waitForPrintWindowToOpen2" />
+        <switchToWindow stepKey="switchToPrintPage2"/>
         <waitForElement selector="{{SalesOrderPrintSection.isOrderPrintPage}}" stepKey="checkPrintPage2"/>
+
         <openNewTab stepKey="openNewTab3"/>
+        <wait time="5" stepKey="waitForNewTabToOpen2" />
         <switchToNextTab stepKey="switchForward4"/>
+        <waitForElement selector="body" stepKey="waitForNewTabHTML" />
         <amOnPage url="{{StorefrontSalesOrderPrintPage.url({$grabOrderIdFromURL})}}" stepKey="duplicatePrintPage2"/>
         <seeElement selector="{{StorefrontCustomerOrderSection.isMyOrdersSection}}" stepKey="waitOrderHistoryPage"/>
     </test>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRuleForBundleProductTest.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRuleForBundleProductTest.xml
@@ -7,7 +7,7 @@
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="CartPriceRuleForBundleProductTest">
+    <test name="StorefrontCartPriceRuleForBundleProductTest">
         <annotations>
             <features value="SalesRule"/>
             <stories value="MAGETWO-28921 - Cart Price Rule for bundle products"/>
@@ -16,6 +16,9 @@
             <severity value="BLOCKER"/>
             <testCaseId value="MAGETWO-28921"/>
             <group value="SalesRule"/>
+            <skip>
+                <issueId value="MQE-2288" />
+            </skip>
         </annotations>
 
         <before>
