Skip to content

Commit 3db5967

Browse files
mkovdryshmkovdrysh
committed
Merge branches '2.3-tests-pr' and 'MC-6338' of github.com:magento-pangolin/magento2ce into MC-6338
2 parents 4fba61b + a35f694 commit 3db5967

File tree

32 files changed

+931
-26
lines changed

32 files changed

+931
-26
lines changed

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
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="AdminAssignCategoryToProductAndSaveActionGroup">
12+
<arguments>
13+
<argument name="categoryName" type="string"/>
14+
</arguments>
15+
<!-- on edit Product page catalog/product/edit/id/{{product_id}}/ -->
16+
<click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="openDropDown"/>
17+
<checkOption selector="{{AdminProductFormSection.selectCategory(categoryName)}}" stepKey="selectCategory"/>
18+
<click selector="{{AdminProductFormSection.done}}" stepKey="clickDone"/>
19+
<waitForPageLoad stepKey="waitForApplyCategory"/>
20+
<click selector="{{AdminProductFormSection.save}}" stepKey="clickSave"/>
21+
<waitForPageLoad stepKey="waitForSavingProduct"/>
22+
<see userInput="You saved the product." selector="{{CatalogProductsSection.messageSuccessSavedProduct}}" stepKey="seeSuccessMessage"/>
23+
</actionGroup>
24+
</actionGroups>

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

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
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="AdminUnassignCategoryOnProductAndSaveActionGroup">
12+
<arguments>
13+
<argument name="categoryName" type="string"/>
14+
</arguments>
15+
<!-- on edit Product page catalog/product/edit/id/{{product_id}}/ -->
16+
<click selector="{{AdminProductFormSection.unselectCategories(categoryName)}}" stepKey="clearCategory"/>
17+
<waitForPageLoad stepKey="waitForDelete"/>
18+
<click selector="{{AdminProductFormSection.save}}" stepKey="clickSave"/>
19+
<waitForPageLoad stepKey="waitForSavingProduct"/>
20+
<see userInput="You saved the product." selector="{{CatalogProductsSection.messageSuccessSavedProduct}}" stepKey="seeSuccessMessage"/>
21+
</actionGroup>
22+
</actionGroups>

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

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
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+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="OpenStoreFrontProductPageActionGroup">
11+
<arguments>
12+
<argument name="productUrlKey" type="string"/>
13+
</arguments>
14+
<amOnPage url="{{StorefrontProductPage.url(productUrlKey)}}" stepKey="amOnProductPage"/>
15+
<waitForPageLoad stepKey="waitForProductPageLoad"/>
16+
</actionGroup>
17+
</actionGroups>

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

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
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="StorefrontGoToCategoryPageActionGroup">
12+
<arguments>
13+
<argument name="categoryName" type="string"/>
14+
</arguments>
15+
<amOnPage url="{{StorefrontHomePage.url}}" stepKey="onFrontend"/>
16+
<waitForPageLoad stepKey="waitForStorefrontPageLoad"/>
17+
<click selector="{{StorefrontHeaderSection.NavigationCategoryByName(categoryName)}}" stepKey="toCategory"/>
18+
<waitForPageLoad stepKey="waitForCategoryPage"/>
19+
</actionGroup>
20+
<actionGroup name="StorefrontGoToSubCategoryPageActionGroup" extends="StorefrontGoToCategoryPageActionGroup">
21+
<arguments>
22+
<argument name="subCategoryName" type="string"/>
23+
</arguments>
24+
<moveMouseOver selector="{{StorefrontHeaderSection.NavigationCategoryByName(categoryName)}}" stepKey="toCategory"/>
25+
<click selector="{{StorefrontHeaderSection.NavigationCategoryByName(subCategoryName)}}" stepKey="openSubCategory" after="toCategory"/>
26+
</actionGroup>
27+
</actionGroups>

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

Lines changed: 314 additions & 0 deletions
Large diffs are not rendered by default.

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
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+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="OpenStoreFrontCheckoutShippingPageActionGroup">
11+
<amOnPage url="{{CheckoutShippingPage.url}}" stepKey="amOnCheckoutShippingPage"/>
12+
<waitForPageLoad stepKey="waitForCheckoutShippingPageLoad"/>
13+
</actionGroup>
14+
</actionGroups>

‎app/code/Magento/Checkout/Test/Mftf/Data/ConfigData.xml

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
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+
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
11+
<!-- Free shipping -->
12+
<entity name="EnableFreeShippingConfigData">
13+
<data key="path">carriers/freeshipping/active</data>
14+
<data key="scope">carriers</data>
15+
<data key="scope_id">1</data>
16+
<data key="label">Yes</data>
17+
<data key="value">1</data>
18+
</entity>
19+
<entity name="EnableFreeShippingToSpecificCountriesConfigData">
20+
<data key="path">carriers/freeshipping/sallowspecific</data>
21+
<data key="scope">carriers</data>
22+
<data key="scope_id">1</data>
23+
<data key="label">Specific Countries</data>
24+
<data key="value">1</data>
25+
</entity>
26+
<entity name="EnableFreeShippingToAfghanistanConfigData">
27+
<data key="path">carriers/freeshipping/specificcountry</data>
28+
<data key="scope">carriers</data>
29+
<data key="scope_id">1</data>
30+
<data key="label">Afghanistan</data>
31+
<data key="value">AF</data>
32+
</entity>
33+
<entity name="EnableFreeShippingToAllAllowedCountriesConfigData">
34+
<data key="path">carriers/freeshipping/sallowspecific</data>
35+
<data key="scope">carriers</data>
36+
<data key="scope_id">1</data>
37+
<data key="label">All Allowed Countries</data>
38+
<data key="value">0</data>
39+
</entity>
40+
<entity name="DisableFreeShippingConfigData">
41+
<data key="path">carriers/freeshipping/active</data>
42+
<data key="scope">carriers</data>
43+
<data key="scope_id">1</data>
44+
<data key="label">No</data>
45+
<data key="value">0</data>
46+
</entity>
47+
48+
<!-- Flat Rate shipping -->
49+
<entity name="EnableFlatRateConfigData">
50+
<data key="path">carriers/flatrate/active</data>
51+
<data key="scope">carriers</data>
52+
<data key="scope_id">1</data>
53+
<data key="label">Yes</data>
54+
<data key="value">1</data>
55+
</entity>
56+
<entity name="EnableFlatRateToSpecificCountriesConfigData">
57+
<data key="path">carriers/flatrate/sallowspecific</data>
58+
<data key="scope">carriers</data>
59+
<data key="scope_id">1</data>
60+
<data key="label">Specific Countries</data>
61+
<data key="value">1</data>
62+
</entity>
63+
<entity name="EnableFlatRateToAfghanistanConfigData">
64+
<data key="path">carriers/flatrate/specificcountry</data>
65+
<data key="scope">carriers</data>
66+
<data key="scope_id">1</data>
67+
<data key="label">Afghanistan</data>
68+
<data key="value">AF</data>
69+
</entity>
70+
<entity name="EnableFlatRateToAllAllowedCountriesConfigData">
71+
<data key="path">carriers/flatrate/sallowspecific</data>
72+
<data key="scope">carriers</data>
73+
<data key="scope_id">1</data>
74+
<data key="label">All Allowed Countries</data>
75+
<data key="value">0</data>
76+
</entity>
77+
<entity name="DisableFlatRateConfigData">
78+
<data key="path">carriers/flatrate/active</data>
79+
<data key="scope">carriers</data>
80+
<data key="scope_id">1</data>
81+
<data key="label">No</data>
82+
<data key="value">0</data>
83+
</entity>
84+
</entities>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,6 @@
1919
<element name="shipHereButton" type="button" selector="//div/following-sibling::div/button[contains(@class, 'action-select-shipping-item')]"/>
2020
<element name="shippingMethodLoader" type="button" selector="//div[contains(@class, 'checkout-shipping-method')]/following-sibling::div[contains(@class, 'loading-mask')]"/>
2121
<element name="freeShippingShippingMethod" type="input" selector="#s_method_freeshipping_freeshipping" timeout="30"/>
22+
<element name="noQuotesMsg" type="text" selector="#checkout-step-shipping_method div"/>
2223
</section>
2324
</sections>

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

Lines changed: 102 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,102 @@
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+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
11+
<test name="AdminCheckConfigsChangesAreNotAffectedStartedCheckoutProcessTest">
12+
<annotations>
13+
<features value="Checkout"/>
14+
<stories value="Changes in configs are not affecting checkout process"/>
15+
<title value="Admin check configs changes are not affected started checkout process test"/>
16+
<description value="Changes in admin for shipping rates are not affecting checkout process that has been started"/>
17+
<severity value="CRITICAL"/>
18+
<testCaseId value="MC-12599"/>
19+
<group value="checkout"/>
20+
</annotations>
21+
<before>
22+
<!-- Create simple product -->
23+
<createData entity="SimpleProduct2" stepKey="createProduct"/>
24+
25+
<!-- Enable free shipping method -->
26+
<magentoCLI command="config:set {{EnableFreeShippingConfigData.path}} {{EnableFreeShippingConfigData.value}}" stepKey="enableFreeShipping"/>
27+
28+
<!-- Disable flat rate method -->
29+
<magentoCLI command="config:set {{DisableFlatRateConfigData.path}} {{DisableFlatRateConfigData.value}}" stepKey="disableFlatRate"/>
30+
</before>
31+
<after>
32+
<!-- Roll back configuration -->
33+
<magentoCLI command="config:set {{EnableFlatRateConfigData.path}} {{EnableFlatRateConfigData.value}}" stepKey="enableFlatRate"/>
34+
<magentoCLI command="config:set {{DisableFreeShippingConfigData.path}} {{DisableFreeShippingConfigData.value}}" stepKey="disableFreeShipping"/>
35+
36+
<!-- Delete simple product -->
37+
<deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
38+
39+
<!-- Log out -->
40+
<actionGroup ref="logout" stepKey="logout"/>
41+
</after>
42+
43+
<!-- Add product to cart -->
44+
<actionGroup ref="OpenStoreFrontProductPageActionGroup" stepKey="openProductPage">
45+
<argument name="productUrlKey" value="$$createProduct.custom_attributes[url_key]$$"/>
46+
</actionGroup>
47+
<actionGroup ref="StorefrontAddProductToCartActionGroup" stepKey="addProductToCart">
48+
<argument name="product" value="$$createProduct$$"/>
49+
<argument name="productCount" value="1"/>
50+
</actionGroup>
51+
52+
<!-- Proceed to Checkout from mini shopping cart -->
53+
<actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckout"/>
54+
55+
<!-- Fill all required fields -->
56+
<actionGroup ref="GuestCheckoutFillNewShippingAddressActionGroup" stepKey="fillNewShippingAddress">
57+
<argument name="customer" value="Simple_Customer_Without_Address" />
58+
<argument name="address" value="US_Address_TX"/>
59+
</actionGroup>
60+
61+
<!-- Assert Free Shipping checkbox -->
62+
<seeCheckboxIsChecked selector="{{CheckoutShippingMethodsSection.shippingMethodFreeShipping}}" stepKey="freeShippingMethodCheckboxIsChecked"/>
63+
64+
<!-- Click Next button -->
65+
<click selector="{{CheckoutShippingGuestInfoSection.next}}" stepKey="clickNext"/>
66+
<waitForPageLoad stepKey="waitForShipmentPageLoad"/>
67+
68+
<!-- Payment step is opened -->
69+
<waitForElement selector="{{CheckoutPaymentSection.paymentSectionTitle}}" stepKey="waitForPaymentSectionLoaded"/>
70+
71+
<!-- Order Summary block contains information about shipping -->
72+
<actionGroup ref="CheckShippingMethodInCheckoutActionGroup" stepKey="guestCheckoutCheckShippingMethod">
73+
<argument name="shippingMethod" value="freeTitleDefault.value"/>
74+
</actionGroup>
75+
76+
<!-- Open new browser's window and login as Admin -->
77+
<openNewTab stepKey="openNewTab"/>
78+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
79+
80+
<!-- Go to Store > Configuration > Sales > Shipping Methods -->
81+
<actionGroup ref="AdminOpenShippingMethodsConfigPageActionGroup" stepKey="openShippingMethodConfigPage"/>
82+
83+
<!-- Enable "Flat Rate" -->
84+
<actionGroup ref="AdminChangeFlatRateShippingMethodStatusActionGroup" stepKey="enableFlatRateShippingStatus"/>
85+
86+
<!-- Flush cache -->
87+
<magentoCLI command="cache:flush" stepKey="cacheFlush"/>
88+
89+
<!-- Back to the Checkout and refresh the page -->
90+
<switchToPreviousTab stepKey="switchToPreviousTab"/>
91+
<reloadPage stepKey="refreshPage"/>
92+
<waitForPageLoad stepKey="waitPageReload"/>
93+
94+
<!-- Payment step is opened after refreshing -->
95+
<waitForElement selector="{{CheckoutPaymentSection.paymentSectionTitle}}" stepKey="waitForPaymentSection"/>
96+
97+
<!-- Order Summary block contains information about free shipping -->
98+
<actionGroup ref="CheckShippingMethodInCheckoutActionGroup" stepKey="guestCheckoutCheckFreeShippingMethod">
99+
<argument name="shippingMethod" value="freeTitleDefault.value"/>
100+
</actionGroup>
101+
</test>
102+
</tests>

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,10 @@
1515
<testCaseId value="MC-14715"/>
1616
<severity value="CRITICAL"/>
1717
<group value="mtf_migrated"/>
18-
<skip>
19-
<issueId value="MC-16684"/>
20-
</skip>
2118
</annotations>
2219

2320
<before>
24-
<createData entity="FlatRateShippingMethodDefault" stepKey="setDefaultFlatRateShippingMethod"/>
21+
<magentoCLI command="config:set {{EnableFlatRateConfigData.path}} {{EnableFlatRateConfigData.value}}" stepKey="enableFlatRate"/>
2522
<createData entity="SimpleSubCategory" stepKey="createSubCategory"/>
2623
<!--Create simple product-->
2724
<createData entity="SimpleProduct2" stepKey="simpleProduct1">

0 commit comments

Comments
 (0)