Skip to content

Commit 91a414d

Browse files
oleg-onuferoleg-onufer
committed
Merge remote-tracking branch 'origin/2.3-develop' into MC-31467
2 parents 8b64733 + b899606 commit 91a414d

22 files changed

+690
-52
lines changed

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

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
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="AssertStorefrontCheckoutCartEstimateShippingAndTaxAddressActionGroup">
12+
<annotations>
13+
<description>Check address data in Estimate Shipping And Tax section of shopping cart on storefront</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="country" type="string" defaultValue="{{US_Address_TX.country}}"/>
17+
<argument name="state" type="string" defaultValue="{{US_Address_TX.state}}"/>
18+
<argument name="postcode" type="string" defaultValue="{{US_Address_TX.postcode}}"/>
19+
</arguments>
20+
21+
<waitForElementVisible selector="{{CheckoutCartSummarySection.subtotal}}" stepKey="waitForSubtotalVisible"/>
22+
<conditionalClick selector="{{CheckoutCartSummarySection.estimateShippingAndTax}}" dependentSelector="{{CheckoutCartSummarySection.country}}" visible="false" stepKey="expandEstimateShippingAndTaxIfNeeded" />
23+
<seeOptionIsSelected selector="{{CheckoutCartSummarySection.country}}" userInput="{{country}}" stepKey="checkCountry"/>
24+
<seeOptionIsSelected selector="{{CheckoutCartSummarySection.stateProvince}}" userInput="{{state}}" stepKey="checkState" />
25+
<grabValueFrom selector="{{CheckoutCartSummarySection.postcode}}" stepKey="grabPostCodeText"/>
26+
<assertEquals message="Address postcode is invalid" stepKey="checkPostcode">
27+
<expectedResult type="string">{{postcode}}</expectedResult>
28+
<actualResult type="variable">grabPostCodeText</actualResult>
29+
</assertEquals>
30+
</actionGroup>
31+
</actionGroups>

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

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
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="StorefrontCheckoutCartFillEstimateShippingAndTaxActionGroup">
12+
<annotations>
13+
<description>Fill address data in Estimate Shipping And Tax section of shopping cart on storefront</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="country" type="string" defaultValue="{{US_Address_TX.country}}"/>
17+
<argument name="state" type="string" defaultValue="{{US_Address_TX.state}}"/>
18+
<argument name="postcode" type="string" defaultValue="{{US_Address_TX.postcode}}"/>
19+
</arguments>
20+
21+
<conditionalClick selector="{{CheckoutCartSummarySection.estimateShippingAndTax}}" dependentSelector="{{CheckoutCartSummarySection.estimateShippingAndTaxSummary}}" visible="false" stepKey="openEestimateShippingAndTaxSection"/>
22+
<selectOption selector="{{CheckoutCartSummarySection.country}}" userInput="{{country}}" stepKey="selectCountry"/>
23+
<selectOption selector="{{CheckoutCartSummarySection.stateProvince}}" userInput="{{state}}" stepKey="selectState"/>
24+
<waitForElementVisible selector="{{CheckoutCartSummarySection.postcode}}" stepKey="waitForPostCodeVisible"/>
25+
<fillField selector="{{CheckoutCartSummarySection.postcode}}" userInput="{{postcode}}" stepKey="selectPostCode"/>
26+
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDiappear"/>
27+
</actionGroup>
28+
</actionGroups>

‎app/code/Magento/Directory/Test/Mftf/Data/GeneralStateOptionsConfigData.xml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
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+
<entity name="AllowToChooseStateIfItIsOptionalForCountryEnabled">
12+
<data key="path">general/region/display_all</data>
13+
<data key="label">Yes</data>
14+
<data key="value">1</data>
15+
</entity>
16+
<entity name="AllowToChooseStateIfItIsOptionalForCountryDisabled">
17+
<data key="path">general/region/display_all</data>
18+
<data key="label">No</data>
19+
<data key="value">0</data>
20+
</entity>
21+
</entities>

‎app/code/Magento/Email/Test/Mftf/Test/TransactionalEmailsLogoUploadTest.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@
1717
<severity value="CRITICAL"/>
1818
<testCaseId value="MC-13908"/>
1919
<group value="LogoUpload"/>
20-
<skip>
21-
<issueId value="MC-18496"/>
22-
</skip>
2320
</annotations>
2421
<!--Login to Admin Area-->
2522
<before>

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

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
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+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
10+
<test name="AdminReorderWithCatalogPriceRuleDiscountTest">
11+
<annotations>
12+
<features value="Sales"/>
13+
<stories value="Admin create order"/>
14+
<title value="Reorder doesn't show discount price in Order Totals block"/>
15+
<description value="Reorder doesn't show discount price in Order Totals block"/>
16+
<severity value="CRITICAL"/>
17+
<testCaseId value="MC-16695"/>
18+
<useCaseId value="MAGETWO-99691"/>
19+
<group value="sales"/>
20+
<group value="catalogRule"/>
21+
</annotations>
22+
23+
<before>
24+
<!--Create product-->
25+
<createData entity="SimpleProduct2" stepKey="createSimpleProductApi"/>
26+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
27+
<actionGroup ref="AdminCatalogPriceRuleDeleteAllActionGroup" stepKey="deleteAllCatalogPriceRule"/>
28+
<!--Create the catalog price rule -->
29+
<createData entity="CatalogRuleToPercent" stepKey="createCatalogRule"/>
30+
<!--Create order via API-->
31+
<createData entity="GuestCart" stepKey="createGuestCart"/>
32+
<createData entity="SimpleCartItem" stepKey="addCartItem">
33+
<requiredEntity createDataKey="createGuestCart"/>
34+
<requiredEntity createDataKey="createSimpleProductApi"/>
35+
</createData>
36+
<createData entity="GuestAddressInformation" stepKey="addGuestOrderAddress">
37+
<requiredEntity createDataKey="createGuestCart"/>
38+
</createData>
39+
<updateData createDataKey="createGuestCart" entity="GuestOrderPaymentMethod" stepKey="sendGuestPaymentInformation">
40+
<requiredEntity createDataKey="createGuestCart"/>
41+
</updateData>
42+
<!--END Create order via API-->
43+
</before>
44+
45+
<after>
46+
<deleteData createDataKey="createSimpleProductApi" stepKey="deleteSimpleProductApi"/>
47+
<actionGroup ref="AdminCatalogPriceRuleDeleteAllActionGroup" stepKey="deleteAllCatalogPriceRule"/>
48+
<actionGroup ref="logout" stepKey="logoutFromAdmin"/>
49+
</after>
50+
51+
<!--Open order by Id-->
52+
<amOnPage url="{{AdminOrderPage.url($createGuestCart.return$)}}" stepKey="navigateToOrderPage"/>
53+
<!--Reorder-->
54+
<click selector="{{AdminOrderDetailsMainActionsSection.reorder}}" stepKey="clickReorder"/>
55+
<!--Verify order item row-->
56+
<waitForElementVisible selector="{{AdminOrderItemsOrderedSection.productPrice('2')}}" stepKey="waitOrderItemPriceToBeVisible"/>
57+
<see selector="{{AdminOrderItemsOrderedSection.productPrice('2')}}" userInput="{{AdminOrderSimpleProductWithCatalogRule.subtotal}}" stepKey="seeOrderItemPrice"/>
58+
<!--Verify totals on Order page-->
59+
<scrollTo selector="{{AdminOrderFormTotalSection.grandTotal}}" stepKey="scrollToOrderGrandTotal"/>
60+
<waitForElementVisible selector="{{AdminOrderFormTotalSection.total('Subtotal')}}" stepKey="waitOrderSubtotalToBeVisible"/>
61+
<see selector="{{AdminOrderFormTotalSection.total('Subtotal')}}" userInput="{{AdminOrderSimpleProductWithCatalogRule.subtotal}}" stepKey="seeOrderSubTotal"/>
62+
<waitForElementVisible selector="{{AdminOrderFormTotalSection.total('Shipping')}}" stepKey="waitOrderShippingToBeVisible"/>
63+
<see selector="{{AdminOrderFormTotalSection.total('Shipping')}}" userInput="{{AdminOrderSimpleProductWithCatalogRule.shipping}}" stepKey="seeOrderShipping"/>
64+
<waitForElementVisible selector="{{AdminOrderFormTotalSection.grandTotal}}" stepKey="waitOrderGrandTotalToBeVisible"/>
65+
<see selector="{{AdminOrderFormTotalSection.grandTotal}}" userInput="{{AdminOrderSimpleProductWithCatalogRule.grandTotal}}" stepKey="seeCorrectGrandTotal"/>
66+
</test>
67+
</tests>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,19 @@
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="AdminReorderWithCatalogPriceTest">
10+
<test name="AdminReorderWithCatalogPriceTest" deprecated="This test is unstable. Please use AdminReorderWithCatalogPriceRuleDiscountTest instead.">
1111
<annotations>
1212
<features value="Sales"/>
1313
<stories value="Admin create order"/>
14-
<title value="Reorder doesn't show discount price in Order Totals block"/>
14+
<title value="DEPRECATED. Reorder doesn't show discount price in Order Totals block"/>
1515
<description value="Reorder doesn't show discount price in Order Totals block"/>
1616
<severity value="CRITICAL"/>
1717
<testCaseId value="MC-16695"/>
1818
<useCaseId value="MAGETWO-99691"/>
1919
<group value="sales"/>
2020
<group value="catalogRule"/>
2121
<skip>
22-
<issueId value="MC-31126"/>
22+
<issueId value="DEPRECATED">Use AdminReorderWithCatalogPriceRuleDiscountTest instead.</issueId>
2323
</skip>
2424
</annotations>
2525
<before>

‎app/code/Magento/Tax/Test/Mftf/ActionGroup/AssertStorefrontCheckoutCartTaxAmountActionGroup.xml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
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="AssertStorefrontCheckoutCartTaxAmountActionGroup">
12+
<annotations>
13+
<description>Check tax summary data in Summary section of shopping cart on storefront</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="taxAmount" type="string" defaultValue="$0.83"/>
17+
<argument name="rate" type="string" defaultValue="US-CA-*-Rate 1 (8.25%)"/>
18+
</arguments>
19+
20+
<see selector="{{CheckoutCartSummarySection.taxAmount}}" userInput="{{taxAmount}}" stepKey="checkTaxAmount" />
21+
<scrollTo selector="{{CheckoutCartSummarySection.taxSummary}}" stepKey="scrollToTaxSummary" />
22+
<conditionalClick selector="{{CheckoutCartSummarySection.taxSummary}}" dependentSelector="{{CheckoutCartSummarySection.rate}}" visible="false" stepKey="expandTaxSummary"/>
23+
<see selector="{{CheckoutCartSummarySection.rate}}" userInput="{{rate}}" stepKey="checkRate" />
24+
</actionGroup>
25+
</actionGroups>

‎app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxInformationInShoppingCartForCustomerPhysicalQuoteTest.xml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,15 @@
1212
<annotations>
1313
<features value="Tax"/>
1414
<stories value="Shopping cart taxes"/>
15-
<title value="Tax information are updating/recalculating on fly in shopping cart for Customer with default addresses (physical quote)"/>
15+
<title value="DEPRECATED. Tax information are updating/recalculating on fly in shopping cart for Customer with default addresses (physical quote)"/>
1616
<description value="Tax information are updating/recalculating on fly in shopping cart for Customer with default addresses (physical quote)"/>
1717
<severity value="CRITICAL"/>
1818
<testCaseId value="MAGETWO-41932"/>
1919
<group value="checkout"/>
2020
<group value="tax"/>
21+
<skip>
22+
<issueId value="DEPRECATED">Use StorefrontFPTTaxInformationInShoppingCartForCustomerPhysicalQuoteTest instead.</issueId>
23+
</skip>
2124
</annotations>
2225
<before>
2326
<!-- Preconditions -->

‎app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxInformationInShoppingCartForCustomerVirtualQuoteTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@
1212
<annotations>
1313
<features value="Tax"/>
1414
<stories value="Shopping cart taxes"/>
15-
<title value="Tax information are updating/recalculating on fly in shopping cart for Customer with default addresses (virtual quote)"/>
15+
<title value="DEPRECATED. Tax information are updating/recalculating on fly in shopping cart for Customer with default addresses (virtual quote)"/>
1616
<description value="Tax information are updating/recalculating on fly in shopping cart for Customer with default addresses (virtual quote)"/>
1717
<severity value="CRITICAL"/>
1818
<testCaseId value="MAGETWO-41933"/>
1919
<group value="checkout"/>
2020
<group value="tax"/>
2121
<skip>
22-
<issueId value="MC-31125"/>
22+
<issueId value="DEPRECATED">Use StorefrontFPTTaxInformationInShoppingCartForCustomerVirtualQuoteTest instead.</issueId>
2323
</skip>
2424
</annotations>
2525
<before>

‎app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxInformationInShoppingCartForGuestPhysicalQuoteTest.xml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,15 @@
1212
<annotations>
1313
<features value="Tax"/>
1414
<stories value="Shopping cart taxes"/>
15-
<title value="Tax information are updating/recalculating on fly in shopping cart for Guest (physical quote)"/>
15+
<title value="DEPRECATED. Tax information are updating/recalculating on fly in shopping cart for Guest (physical quote)"/>
1616
<description value="Tax information are updating/recalculating on fly in shopping cart for Guest (physical quote)"/>
1717
<severity value="CRITICAL"/>
1818
<testCaseId value="MAGETWO-41930"/>
1919
<group value="checkout"/>
2020
<group value="tax"/>
21+
<skip>
22+
<issueId value="DEPRECATED">Use StorefrontFPTTaxInformationInShoppingCartForGuestPhysicalQuoteTest instead.</issueId>
23+
</skip>
2124
</annotations>
2225
<before>
2326
<!-- Preconditions -->

0 commit comments

Comments
 (0)