Skip to content

Commit 5e0d8a6

Browse files
okolesnykokolesnyk
authored
Merge pull request #6137 from magento-pangolin/MQE-2133
[MTS | Pangolin] Update Chrome browser to version 85
2 parents 5977749 + 1c90d8b commit 5e0d8a6

16 files changed

+54
-10
lines changed

‎app/code/Magento/Backend/Test/Mftf/Test/AdminMenuNavigationWithSecretKeysTest.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,18 +35,21 @@
3535

3636
<click selector="{{AdminMenuSection.stores}}" stepKey="clickStoresMenuOption1"/>
3737
<waitForLoadingMaskToDisappear stepKey="waitForStoresMenu1" />
38+
<waitForElementVisible selector="{{AdminMenuSection.configuration}}" stepKey="waitForConfigurationVisible1"/>
3839
<click selector="{{AdminMenuSection.configuration}}" stepKey="clickStoresConfigurationMenuOption1"/>
3940
<waitForPageLoad stepKey="waitForConfigurationPageLoad1"/>
4041
<seeCurrentUrlMatches regex="~\/admin\/system_config\/~" stepKey="seeCurrentUrlMatchesConfigPath1"/>
4142

4243
<click selector="{{AdminMenuSection.catalog}}" stepKey="clickCatalogMenuOption"/>
4344
<waitForLoadingMaskToDisappear stepKey="waitForCatalogMenu1" />
45+
<waitForElementVisible selector="{{AdminMenuSection.catalogProducts}}" stepKey="waitForCatalogProductsVisible"/>
4446
<click selector="{{AdminMenuSection.catalogProducts}}" stepKey="clickCatalogProductsMenuOption"/>
4547
<waitForPageLoad stepKey="waitForProductsPageLoad"/>
4648
<seeCurrentUrlMatches regex="~\/catalog\/product\/~" stepKey="seeCurrentUrlMatchesProductsPath"/>
4749

4850
<click selector="{{AdminMenuSection.stores}}" stepKey="clickStoresMenuOption2"/>
4951
<waitForLoadingMaskToDisappear stepKey="waitForStoresMenu2" />
52+
<waitForElementVisible selector="{{AdminMenuSection.configuration}}" stepKey="waitForConfigurationVisible2"/>
5053
<click selector="{{AdminMenuSection.configuration}}" stepKey="clickStoresConfigurationMenuOption2"/>
5154
<waitForPageLoad stepKey="waitForConfigurationPageLoad2"/>
5255
<seeCurrentUrlMatches regex="~\/admin\/system_config\/~" stepKey="seeCurrentUrlMatchesConfigPath2"/>

‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCreateAttributeFromProductPageActionGroup.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,9 @@
1818
</arguments>
1919

2020
<click selector="{{AdminProductFormSection.addAttributeBtn}}" stepKey="clickAddAttributeBtn"/>
21-
<see userInput="Select Attribute" stepKey="checkNewAttributePopUpAppeared"/>
21+
<waitForText userInput="Select Attribute" stepKey="checkNewAttributePopUpAppeared"/>
2222
<click selector="{{AdminProductFormAttributeSection.createNewAttribute}}" stepKey="clickCreateNewAttribute"/>
23+
<waitForElementVisible selector="{{AdminProductFormNewAttributeSection.attributeLabel}}" stepKey="waitForAttrLabel" />
2324
<fillField selector="{{AdminProductFormNewAttributeSection.attributeLabel}}" userInput="{{attributeName}}" stepKey="fillAttributeLabel"/>
2425
<selectOption selector="{{AdminProductFormNewAttributeSection.attributeType}}" userInput="{{attributeType}}" stepKey="selectAttributeType"/>
2526
<click selector="{{AdminProductFormNewAttributeSection.saveAttribute}}" stepKey="saveAttribute"/>

‎app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontAddCategoryProductToCartWithQuantityActionGroup.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
<waitForText userInput="{{checkQuantity}}" selector="{{StorefrontMinicartSection.productCount}}" time="30" stepKey="assertProductCount"/>
2727
<conditionalClick selector="{{StorefrontMinicartSection.showCart}}" dependentSelector="{{StorefrontMinicartSection.miniCartOpened}}" visible="false" stepKey="openMiniCart"/>
2828
<waitForElementVisible selector="{{StorefrontMinicartSection.viewAndEditCart}}" stepKey="waitForViewAndEditCartVisible"/>
29+
<doubleClick selector="{{StorefrontMinicartSection.itemQuantity(product.name)}}" stepKey="doubleClickOnQtyInput"/>
30+
<pressKey selector="{{StorefrontMinicartSection.itemQuantity(product.name)}}" parameterArray="[\Facebook\WebDriver\WebDriverKeys::DELETE]" stepKey="clearQty"/>
2931
<fillField selector="{{StorefrontMinicartSection.itemQuantity(product.name)}}" userInput="{{quantity}}" stepKey="setProductQtyToFiftyInMiniCart"/>
3032
<click selector="{{StorefrontMinicartSection.itemQuantityUpdate(product.name)}}" stepKey="updateQtyInMiniCart"/>
3133
</actionGroup>

‎app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontOpenCartFromMinicartActionGroup.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<description>Clicks on the Storefront Mini Shopping Cart icon. Click on 'View and Edit Cart'.</description>
1414
</annotations>
1515

16+
<scrollToTopOfPage stepKey="scrollToTopOfThePage" />
1617
<waitForElement selector="{{StorefrontMinicartSection.showCart}}" stepKey="waitForShowMinicart"/>
1718
<waitForElement selector="{{StorefrontMinicartSection.viewAndEditCart}}" stepKey="waitForCartLink"/>
1819
<click selector="{{StorefrontMinicartSection.showCart}}" stepKey="clickShowMinicart"/>

‎app/code/Magento/Cms/Test/Mftf/Test/AdminCmsPageMassActionTest.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828
<after>
2929
<deleteData createDataKey="firstCMSPage" stepKey="deleteFirstCMSPage" />
3030
<deleteData createDataKey="secondCMSPage" stepKey="deleteSecondCMSPage" />
31+
<actionGroup ref="AdminOpenCMSPagesGridActionGroup" stepKey="navigateToCMSPageGrid"/>
32+
<actionGroup ref="AdminGridFilterResetActionGroup" stepKey="clearPossibleGridFilters"/>
3133
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
3234
</after>
3335

‎app/code/Magento/Cms/Test/Mftf/Test/CheckOrderOfProdsInWidgetOnCMSPageTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@
102102
<actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage2">
103103
<argument name="CMSPage" value="$$createCMSPage$$"/>
104104
</actionGroup>
105+
<scrollTo stepKey="scrollToContent" selector="{{CmsNewPagePageContentSection.header}}" x="0" y="-80"/>
105106
<conditionalClick selector="{{CmsNewPagePageContentSection.header}}"
106107
dependentSelector="{{CmsNewPagePageContentSection.header}}._show" visible="false"
107108
stepKey="clickContentTab2"/>

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,8 @@
135135
<click selector="{{AdminOrderFormConfigureProductSection.configure($$createConfigProduct.id$$)}}" stepKey="clickOnConfigure"/>
136136
<!-- Click on attribute drop-down and check no option 1 is available -->
137137
<comment userInput="Click on attribute drop-down and check no option 1 is available" stepKey="commentNoOptionIsAvailable"/>
138-
<waitForElement selector="{{AdminOrderFormConfigureProductSection.selectOption}}" stepKey="waitForShippingSectionLoaded"/>
138+
<waitForPageLoad stepKey="waitForConfigure"/>
139+
<waitForElementVisible selector="{{AdminOrderFormConfigureProductSection.selectOption}}" stepKey="waitForShippingSectionLoaded"/>
139140
<click selector="{{AdminOrderFormConfigureProductSection.selectOption}}" stepKey="clickToSelectOption"/>
140141
<dontSee userInput="$$createConfigProductAttributeOption1.option[store_labels][1][label]$$" stepKey="dontSeeOption1"/>
141142
<!-- Go to created customer page again -->

‎app/code/Magento/Customer/Test/Mftf/Test/AdminGridSelectAllOnPageTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
</after>
3333
<amOnPage url="{{AdminCustomerPage.url}}" stepKey="openCustomerPage"/>
3434
<!-- Select all from dropdown -->
35+
<actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearFilters" />
3536
<actionGroup ref="AdminGridSelectAllActionGroup" stepKey="selectAllCustomers"/>
3637
<!-- Deselect third customer -->
3738
<click selector="{{AdminCustomerGridMainActionsSection.customerCheckbox(($$thirdCustomer.email$$)}}" stepKey="selectThirdCustomer"/>

‎app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryAssertImagesDeletedInBulkActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@
1515
<arguments>
1616
<argument name="numberOfAssetsDeleted" type="string"/>
1717
</arguments>
18-
<see userInput='{{numberOfAssetsDeleted}} assets have been successfully deleted.' stepKey="verifyDeleteImages"/>
18+
<waitForText userInput='{{numberOfAssetsDeleted}} assets have been successfully deleted.' stepKey="verifyDeleteImages"/>
1919
</actionGroup>
2020
</actionGroups>

‎app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryAssertMassActionModeDetailsActionGroup.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<arguments>
1616
<argument name="imageName" type="string"/>
1717
</arguments>
18-
<click selector="{{AdminEnhancedMediaGalleryMassActionSection.massActionCheckbox(imageName)}}" stepKey="selectImageInGridToDelte"/>
19-
<see selector="{{AdminEnhancedMediaGalleryMassActionSection.totalSelected}}" userInput="(1 Selected)" stepKey="verifySelectedCount"/>
18+
<checkOption selector="{{AdminEnhancedMediaGalleryMassActionSection.massActionCheckbox(imageName)}}" stepKey="selectImageInGridToDelte"/>
19+
<waitForText selector="{{AdminEnhancedMediaGalleryMassActionSection.totalSelected}}" userInput="(1 Selected)" stepKey="verifySelectedCount"/>
2020
</actionGroup>
2121
</actionGroups>

‎app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryEnableMassActionModeActionGroup.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,10 @@
1313
<description>Activate massaction mode by click on Delete Selected..</description>
1414
</annotations>
1515

16+
<wait stepKey="waitBefore" time="5" />
1617
<waitForElementVisible selector="{{AdminEnhancedMediaGalleryMassActionSection.deleteImages}}" stepKey="waitForMassActionButton"/>
1718
<click selector="{{AdminEnhancedMediaGalleryMassActionSection.deleteImages}}" stepKey="clickOnMassActionButton"/>
19+
<waitForPageLoad stepKey="waitForPageLoaded" />
20+
<wait stepKey="waitAfter" time="5" />
1821
</actionGroup>
1922
</actionGroups>

‎app/code/Magento/Review/Test/Mftf/Test/AdminReviewsByProductsReportTest.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@
1616
<description value="Review By Products Grid Filters"/>
1717
<severity value="AVERAGE"/>
1818
<testCaseId value="MC-32333"/>
19+
<skip>
20+
<issueId value="MQE-2288" />
21+
</skip>
1922
</annotations>
2023
<before>
2124
<!--Login-->

‎app/code/Magento/Sales/Test/Mftf/Section/SalesOrderPrintSection.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
1111
<section name="SalesOrderPrintSection">
12-
<element name="isOrderPrintPage" type="block" selector=".preview-area"/>
12+
<element name="isOrderPrintPage" type="block" selector="print-preview-app"/>
1313
</section>
1414
</sections>

‎app/code/Magento/Sales/Test/Mftf/Test/StorefrontPrintOrderGuestTest.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@
1717
<testCaseId value="MC-16225"/>
1818
<group value="sales"/>
1919
<group value="mtf_migrated"/>
20+
<skip>
21+
<issueId value="MQE-2288" />
22+
</skip>
2023
</annotations>
2124
<before>
2225
<magentoCLI command="downloadable:domains:add" arguments="example.com static.magento.com" stepKey="addDownloadableDomain"/>
@@ -262,8 +265,11 @@
262265

263266
<!-- Click on the "Print Order" button -->
264267
<click selector="{{StorefrontGuestOrderViewSection.printOrder}}" stepKey="printOrder"/>
268+
<wait time="5" stepKey="waitForPrintWindowToOpen" />
265269
<switchToWindow stepKey="switchToWindow"/>
270+
<wait time="5" stepKey="waitForPrintTabToOpen" />
266271
<switchToNextTab stepKey="switchToTab"/>
272+
<wait stepKey="waitForPrintPreviewToLoad" time="5" />
267273
<seeInCurrentUrl url="sales/guest/print/order_id/" stepKey="seePrintPage"/>
268274

269275
<!-- AssertSalesPrintOrderProducts -->

‎app/code/Magento/Sales/Test/Mftf/Test/StorefrontRedirectToOrderHistoryTest.xml

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@
1818
<severity value="MAJOR"/>
1919
<testCaseId value="MAGETWO-92854"/>
2020
<group value="sales"/>
21+
<skip>
22+
<issueId value="MQE-2288" />
23+
</skip>
2124
</annotations>
2225
<before>
2326
<createData entity="_defaultCategory" stepKey="createCategory"/>
@@ -46,15 +49,25 @@
4649

4750
<!--Go to 'print order' page by grabbed order id-->
4851
<grabFromCurrentUrl regex="~/order_id/(\d+)/~" stepKey="grabOrderIdFromURL"/>
49-
<switchToNextTab stepKey="switchToPrintPage"/>
52+
<wait time="5" stepKey="waitForPrintWindowToOpen" />
53+
<switchToWindow stepKey="switchToPrintPage"/>
5054
<waitForElement selector="{{SalesOrderPrintSection.isOrderPrintPage}}" stepKey="checkPrintPage"/>
5155
<openNewTab stepKey="openNewTab"/>
56+
<wait time="5" stepKey="waitForNewTabToOpen" />
5257
<switchToNextTab stepKey="switchForward"/>
58+
<waitForElement selector="body" stepKey="waitForNewTab3HTML" />
5359
<amOnPage url="{{StorefrontSalesOrderPrintPage.url({$grabOrderIdFromURL})}}" stepKey="duplicatePrintPage"/>
5460

61+
<wait time="5" stepKey="waitForDuplicatePrintWindowToOpen" />
62+
<switchToWindow stepKey="switchToDuplicatePrintPage"/>
63+
<waitForElement selector="{{SalesOrderPrintSection.isOrderPrintPage}}" stepKey="checkDuplicatePrintPage"/>
64+
5565
<!--Log out as customer 1-->
56-
<switchToNextTab stepKey="switchForward2"/>
5766
<openNewTab stepKey="openNewTab2"/>
67+
<wait time="5" stepKey="waitForNewTabToOpen1" />
68+
<switchToNextTab stepKey="switchForward2"/>
69+
<waitForElement selector="body" stepKey="waitForNewTab2HTML" />
70+
5871
<amOnPage url="{{StorefrontCustomerSignOutPage.url}}" stepKey="signOut"/>
5972
<waitForLoadingMaskToDisappear stepKey="waitSignOutPage"/>
6073

@@ -69,10 +82,14 @@
6982
</actionGroup>
7083

7184
<!--Try to load 'print order' page with not relevant order id to be redirected to 'order history' page-->
72-
<switchToNextTab stepKey="switchToPrintPage2"/>
85+
<wait time="5" stepKey="waitForPrintWindowToOpen2" />
86+
<switchToWindow stepKey="switchToPrintPage2"/>
7387
<waitForElement selector="{{SalesOrderPrintSection.isOrderPrintPage}}" stepKey="checkPrintPage2"/>
88+
7489
<openNewTab stepKey="openNewTab3"/>
90+
<wait time="5" stepKey="waitForNewTabToOpen2" />
7591
<switchToNextTab stepKey="switchForward4"/>
92+
<waitForElement selector="body" stepKey="waitForNewTabHTML" />
7693
<amOnPage url="{{StorefrontSalesOrderPrintPage.url({$grabOrderIdFromURL})}}" stepKey="duplicatePrintPage2"/>
7794
<seeElement selector="{{StorefrontCustomerOrderSection.isMyOrdersSection}}" stepKey="waitOrderHistoryPage"/>
7895
</test>

‎app/code/Magento/SalesRule/Test/Mftf/Test/CartPriceRuleForBundleProductTest.xml renamed to ‎app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRuleForBundleProductTest.xml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
-->
88
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
10-
<test name="CartPriceRuleForBundleProductTest">
10+
<test name="StorefrontCartPriceRuleForBundleProductTest">
1111
<annotations>
1212
<features value="SalesRule"/>
1313
<stories value="MAGETWO-28921 - Cart Price Rule for bundle products"/>
@@ -16,6 +16,9 @@
1616
<severity value="BLOCKER"/>
1717
<testCaseId value="MAGETWO-28921"/>
1818
<group value="SalesRule"/>
19+
<skip>
20+
<issueId value="MQE-2288" />
21+
</skip>
1922
</annotations>
2023

2124
<before>

0 commit comments

Comments
 (0)