Skip to content

Commit 479f304

Browse files
joanhejoanhe
authored
Merge pull request #6404 from magento-arcticfoxes/2.4-develop-pr
[arcticfoxes] PRs
2 parents 91aaeec + f7327e4 commit 479f304

24 files changed

+289
-15
lines changed

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveCategoryToAnotherPositionInCategoryTreeTest.xml‎

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,23 +38,27 @@
3838
<waitForPageLoad stepKey="waitForPageToLoad"/>
3939
<!-- Create three level deep sub Category -->
4040
<click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickAddSubCategoryButton"/>
41+
<waitForPageLoad stepKey="waitForAddSubCategoryClick1"/>
42+
<waitForElementVisible selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" stepKey="waitForSubCategoryName1"/>
4143
<fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{FirstLevelSubCat.name}}" stepKey="fillSubCategoryName"/>
4244
<actionGroup ref="AdminSaveCategoryActionGroup" stepKey="saveFirstLevelSubCategory"/>
43-
<seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccessMessage"/>
45+
<waitForElementVisible selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccessMessage"/>
4446
<click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategoryButtonAgain"/>
47+
<waitForPageLoad stepKey="waitForAddSubCategoryClick2"/>
48+
<waitForElementVisible selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" stepKey="waitForSubCategoryName2"/>
4549
<fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{SecondLevelSubCat.name}}" stepKey="fillSecondLevelSubCategoryName"/>
4650
<actionGroup ref="AdminSaveCategoryActionGroup" stepKey="saveSecondLevelSubCategory"/>
47-
<seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSaveSuccessMessage"/>
51+
<waitForElementVisible selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSaveSuccessMessage"/>
4852
<grabFromCurrentUrl stepKey="categoryId" regex="#\/([0-9]*)?\/$#" />
4953

5054
<!-- Move Category to another position in category tree, but click cancel button -->
5155
<dragAndDrop selector1="{{AdminCategorySidebarTreeSection.categoryInTree(SecondLevelSubCat.name)}}" selector2="{{AdminCategorySidebarTreeSection.categoryInTree('Default Category')}}" stepKey="moveCategory"/>
52-
<see selector="{{AdminCategoryModalSection.message}}" userInput="This operation can take a long time" stepKey="seeWarningMessage"/>
56+
<waitForText selector="{{AdminCategoryModalSection.message}}" userInput="This operation can take a long time" stepKey="seeWarningMessage"/>
5357
<click selector="{{AdminCategoryModalSection.cancel}}" stepKey="clickCancelButtonOnWarningPopup"/>
5458
<!-- Verify Category in store front page after clicking cancel button -->
5559
<amOnPage url="/$$createDefaultCategory.name$$/{{FirstLevelSubCat.name}}/{{SecondLevelSubCat.name}}.html" stepKey="seeTheCategoryInStoreFrontPage"/>
5660
<waitForPageLoad stepKey="waitForStoreFrontPageLoad"/>
57-
<seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(_defaultCategory.name)}}" stepKey="seeDefaultCategoryOnStoreNavigationBar"/>
61+
<waitForElementVisible selector="{{StorefrontHeaderSection.NavigationCategoryByName(_defaultCategory.name)}}" stepKey="seeDefaultCategoryOnStoreNavigationBar"/>
5862
<dontSeeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleSubCategory.name)}}" stepKey="dontSeeSubCategoryOnStoreNavigationBar"/>
5963
<!-- Verify breadcrumbs in store front page after clicking cancel button -->
6064
<grabMultiple selector="{{StorefrontNavigationSection.categoryBreadcrumbs}}" stepKey="breadcrumbs"/>
@@ -67,17 +71,18 @@
6771
<actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="openTheAdminCategoryIndexPage"/>
6872
<actionGroup ref="AdminExpandCategoryTreeActionGroup" stepKey="clickOnExpandTree"/>
6973
<dragAndDrop selector1="{{AdminCategorySidebarTreeSection.categoryInTree(SecondLevelSubCat.name)}}" selector2="{{AdminCategorySidebarTreeSection.categoryInTree('Default Category')}}" stepKey="DragCategory"/>
70-
<see selector="{{AdminCategoryModalSection.message}}" userInput="This operation can take a long time" stepKey="seeWarningMessageForOneMoreTime"/>
74+
<waitForText selector="{{AdminCategoryModalSection.message}}" userInput="This operation can take a long time" stepKey="seeWarningMessageForOneMoreTime"/>
75+
<waitForElementVisible selector="{{AdminCategoryModalSection.ok}}" stepKey="waitForOkButtonOnWarningPopup"/>
7176
<click selector="{{AdminCategoryModalSection.ok}}" stepKey="clickOkButtonOnWarningPopup"/>
7277
<waitForPageLoad stepKey="waitTheForPageToLoad"/>
73-
<see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You moved the category." stepKey="seeSuccessMoveMessage"/>
78+
<waitForText selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You moved the category." stepKey="seeSuccessMoveMessage"/>
7479
<amOnPage url="/{{SimpleSubCategory.name}}.html" stepKey="seeCategoryNameInStoreFrontPage"/>
7580
<waitForPageLoad stepKey="waitForStoreFrontPageToLoad"/>
7681
<!-- Verify Category in store front after moving category to another position in category tree -->
7782
<amOnPage url="{{StorefrontCategoryPage.url(SecondLevelSubCat.name)}}" stepKey="amOnCategoryPage"/>
7883
<waitForPageLoad stepKey="waitForPageToBeLoaded"/>
79-
<seeElement selector="{{StorefrontCategoryMainSection.CategoryTitle(SecondLevelSubCat.name)}}" stepKey="seeCategoryInTitle"/>
80-
<seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(SecondLevelSubCat.name)}}" stepKey="seeCategoryOnStoreNavigationBarAfterMove"/>
84+
<waitForElementVisible selector="{{StorefrontCategoryMainSection.CategoryTitle(SecondLevelSubCat.name)}}" stepKey="seeCategoryInTitle"/>
85+
<waitForElementVisible selector="{{StorefrontHeaderSection.NavigationCategoryByName(SecondLevelSubCat.name)}}" stepKey="seeCategoryOnStoreNavigationBarAfterMove"/>
8186
<!-- Verify breadcrumbs in store front page after moving category to another position in category tree -->
8287
<click selector="{{StorefrontHeaderSection.NavigationCategoryByName(SecondLevelSubCat.name)}}" stepKey="clickCategoryOnNavigation"/>
8388
<waitForPageLoad stepKey="waitForCategoryLoad"/>
@@ -91,6 +96,7 @@
9196
<amOnPage url="{{AdminUrlRewriteIndexPage.url}}" stepKey="openUrlRewriteIndexPage"/>
9297
<waitForPageLoad stepKey="waitForUrlRewritePageLoad"/>
9398
<click selector="{{AdminDataGridHeaderSection.filters}}" stepKey="openUrlRewriteGridFilters"/>
99+
<waitForElementVisible selector="{{AdminDataGridHeaderSection.filterFieldInput('request_path')}}" stepKey="waitForCategoryUrlKey"/>
94100
<fillField selector="{{AdminDataGridHeaderSection.filterFieldInput('request_path')}}" userInput="{{SecondLevelSubCat.name_lwr}}.html" stepKey="fillCategoryUrlKey"/>
95101
<click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickOrderApplyFilters"/>
96102
<waitForPageLoad stepKey="waitForSearch"/>
@@ -102,6 +108,7 @@
102108
<see selector="{{AdminUrlRewriteIndexSection.gridCellByColumnRowNumber('2', 'Redirect Type')}}" userInput="No" stepKey="verifyTheRedirectTypeAfterMove"/>
103109
<!-- Verify before move Redirect Path displayed with associated Target Path and Redirect Type-->
104110
<click selector="{{AdminDataGridHeaderSection.filters}}" stepKey="openUrlRewriteGridFilters1"/>
111+
<waitForElementVisible selector="{{AdminDataGridHeaderSection.filterFieldInput('request_path')}}" stepKey="waitForTheCategoryUrlKey"/>
105112
<fillField selector="{{AdminDataGridHeaderSection.filterFieldInput('request_path')}}" userInput="{{SecondLevelSubCat.name_lwr}}" stepKey="fillTheCategoryUrlKey"/>
106113
<click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickOrderApplyFilters1"/>
107114
<waitForPageLoad stepKey="waitForSearch1"/>

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

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="StorefrontClickOrderLinkFromCheckoutSuccessPageActionGroup">
12+
<annotations>
13+
<description>Clicks the order number link from the checkout success page</description>
14+
</annotations>
15+
<click selector="{{CheckoutSuccessMainSection.orderLink}}" stepKey="clickOrderLink"/>
16+
<waitForPageLoad stepKey="waitForPageLoad"/>
17+
<waitForText selector="{{StorefrontCustomerAccountMainSection.pageTitle}}" userInput="Order #" stepKey="waitForPageTitle"/>
18+
</actionGroup>
19+
</actionGroups>

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

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="StorefrontOpenCustomStoreCheckoutPageActionGroup" extends="StorefrontOpenCheckoutPageActionGroup">
12+
<annotations>
13+
<description>Goes to the Storefront Checkout page in a custom store. Must have Add Store Code To Urls enabled</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="storeCode" defaultValue="{{customStoreEN.code}}" type="string"/>
17+
</arguments>
18+
<amOnPage url="{{StorefrontCustomStoreCheckoutPage.url(storeCode)}}" stepKey="openCheckoutPage"/>
19+
</actionGroup>
20+
</actionGroups>

‎app/code/Magento/Checkout/Test/Mftf/Page/StorefrontCustomStoreCheckoutPage.xml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
11+
<page name="StorefrontCustomStoreCheckoutPage" url="/{{storeCode}}/checkout" area="storefront" module="Magento_Checkout" parameterized="true">
12+
<section name="StorefrontCheckoutPageMessagesSection"/>
13+
<section name="CheckoutShippingSection"/>
14+
<section name="CheckoutShippingMethodsSection"/>
15+
<section name="CheckoutOrderSummarySection"/>
16+
<section name="CheckoutSuccessMainSection"/>
17+
<section name="CheckoutPaymentSection"/>
18+
<section name="SelectShippingBillingPopupSection"/>
19+
</page>
20+
</pages>

‎app/code/Magento/Checkout/Test/Mftf/Section/StorefrontCheckoutPaymentMethodSection.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
<element name="checkPaymentMethodByName" type="radio" selector="//div[@id='checkout-payment-method-load']//div[@class='payment-method']//label//span[contains(., '{{methodName}}')]/../..//input" parameterized="true"/>
1414
<element name="billingAddressSameAsShipping" type="checkbox" selector=".payment-method._active [name='billing-address-same-as-shipping']"/>
1515
<element name="billingAddressSameAsShippingShared" type="checkbox" selector="#billing-address-same-as-shipping-shared"/>
16-
<element name="paymentOnAccount" type="radio" selector="#companycredit"/>
17-
<element name="paymentOnAccountLabel" type="text" selector="//span[text()='Payment on Account']"/>
16+
<element name="paymentOnAccount" type="radio" selector="#companycredit" deprecated="Use StorefrontCheckoutPaymentSection.paymentOnAccount B2B repository"/>
17+
<element name="paymentOnAccountLabel" type="text" selector="//span[text()='Payment on Account']" deprecated="Use StorefrontCheckoutPaymentSection.paymentOnAccountLabel in B2B repository"/>
1818
<element name="purchaseOrderNumber" type="input" selector="#po_number"/>
1919
</section>
2020
</sections>

‎app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontFreeShippingRecalculationAfterCouponCodeAddedTest.xml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,9 @@
8787
<waitForPageLoad stepKey="waitForPageLoad"/>
8888
<see userInput="Your coupon was successfully applied." stepKey="seeSuccessMessage"/>
8989
<click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder1"/>
90-
<waitForPageLoad stepKey="waitForError"/>
91-
<see stepKey="seeShippingMethodError" userInput="The shipping method is missing. Select the shipping method and try again."/>
90+
<!-- Cannot use waitForPageLoad as the below error message will disappear after a few seconds & waitForPageLoad will cause this test to be flaky -->
91+
<comment userInput="BIC workaround" stepKey="waitForError"/>
92+
<waitForText stepKey="seeShippingMethodError" userInput="The shipping method is missing. Select the shipping method and try again."/>
9293
<amOnPage stepKey="navigateToShippingPage" url="{{CheckoutShippingPage.url}}"/>
9394
<waitForPageLoad stepKey="waitForShippingPageLoad"/>
9495
<click stepKey="chooseFlatRateShipping" selector="{{CheckoutShippingMethodsSection.shippingMethodRowByName('Flat Rate')}}"/>

‎app/code/Magento/Checkout/Test/Mftf/Test/StorefrontDeleteSimpleProductFromMiniShoppingCartTest.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
<argument name="productName" value="$$simpleProduct.name$$"/>
5555
</actionGroup>
5656
<reloadPage stepKey="reloadPage"/>
57+
<waitForPageLoad stepKey="waitForPageLoad"/>
5758

5859
<!--Check the minicart is empty and verify AssertProductAbsentInMiniShoppingCart-->
5960
<actionGroup ref="AssertMiniCartEmptyActionGroup" stepKey="miniCartEnpty"/>

‎app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminOpenAccountInformationTabFromCustomerEditPageActionGroup.xml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AdminOpenAccountInformationTabFromCustomerEditPageActionGroup">
12+
<annotations>
13+
<description>Open Account Information tab from Customer's edit page</description>
14+
</annotations>
15+
<waitForElementVisible selector="{{AdminCustomerAccountInformationSection.accountInformationTab}}" stepKey="waitForAccountInformationTab"/>
16+
<click selector="{{AdminCustomerAccountInformationSection.accountInformationTab}}" stepKey="clickAccountInformationTab"/>
17+
<waitForPageLoad stepKey="waitForPageLoad"/>
18+
</actionGroup>
19+
</actionGroups>

‎app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminSetCustomerActiveViaGridActionGroup.xml‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AdminSuccessfullySetCustomerActiveViaGridActionGroup">
12+
<annotations>
13+
<description>Sets a Customer to the Active status from the admin All Customers grid</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="customerEmail" type="string" defaultValue="{{Simple_US_CA_Customer.email}}"/>
17+
</arguments>
18+
<waitForElementVisible selector="{{AdminCustomerGridMainActionsSection.customerCheckbox(customerEmail)}}" stepKey="waitForCustomerRow"/>
19+
<click selector="{{AdminCustomerGridMainActionsSection.customerCheckbox(customerEmail)}}" stepKey="selectCustomer"/>
20+
<click selector="{{AdminCustomerGridMainActionsSection.actions}}" stepKey="clickActions"/>
21+
<waitForElementVisible selector="{{AdminCustomerGridMainActionsSection.setActive}}" stepKey="waitForDropDownOpen"/>
22+
<click selector="{{AdminCustomerGridMainActionsSection.setActive}}" stepKey="clickSetActive"/>
23+
<waitForPageLoad stepKey="waitForLoad"/>
24+
<waitForText selector="{{AdminMessagesSection.success}}" userInput="A total of 1 record(s) were updated." stepKey="seeSuccessMessage"/>
25+
</actionGroup>
26+
</actionGroups>

‎app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminSetCustomerInactiveViaGridActionGroup.xml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AdminSuccessfullySetCustomerInactiveViaGridActionGroup" extends="AdminSuccessfullySetCustomerActiveViaGridActionGroup">
12+
<annotations>
13+
<description>Sets a Customer to the Inactive status from the admin All Customers grid</description>
14+
</annotations>
15+
<waitForElementVisible selector="{{AdminCustomerGridMainActionsSection.setInactive}}" stepKey="waitForDropDownOpen"/>
16+
<click selector="{{AdminCustomerGridMainActionsSection.setInactive}}" stepKey="clickSetActive"/>
17+
</actionGroup>
18+
</actionGroups>

0 commit comments

Comments
 (0)