Skip to content

Commit 9945bcd

Browse files
romadjelfromadjelf
committed
MC-23908: Tax estimation fails on CI
1 parent 5cd4345 commit 9945bcd

File tree

5 files changed

+257
-3
lines changed

5 files changed

+257
-3
lines changed

‎app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontCartShippingMethodSelectActionGroup.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+
<!-- Select Shipping Method on Cart -->
12+
<actionGroup name="StorefrontCartShippingMethodSelectActionGroup">
13+
<annotations>
14+
<description>Select a shipping method in the Estimate Shipping and Tax block on the Storefront Shopping Cart page.</description>
15+
</annotations>
16+
<arguments>
17+
<argument name="carrierCode" defaultValue="flatrate" type="string"/>
18+
<argument name="methodCode" defaultValue="flatrate" type="string"/>
19+
</arguments>
20+
21+
<conditionalClick selector="{{CheckoutCartSummarySection.shippingMethodElementId(carrierCode, methodCode)}}" dependentSelector="{{CheckoutCartSummarySection.shippingMethodChecked(carrierCode, methodCode)}}" visible="false" stepKey="selectShippingMethod"/>
22+
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
23+
</actionGroup>
24+
</actionGroups>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
<element name="methodName" type="text" selector="#co-shipping-method-form label"/>
3636
<element name="shippingPrice" type="text" selector="#co-shipping-method-form span .price"/>
3737
<element name="shippingMethodElementId" type="radio" selector="#s_method_{{carrierCode}}_{{methodCode}}" parameterized="true"/>
38+
<element name="shippingMethodChecked" type="radio" parameterized="true" selector="#s_method_{{carrierCode}}_{{methodCode}}:checked"/>
3839
<element name="estimateShippingAndTaxForm" type="block" selector="#shipping-zip-form"/>
3940
</section>
4041
</sections>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@
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="StorefrontGuestCheckoutUsingFreeShippingAndTaxesTest">
10+
<test name="StorefrontGuestCheckoutUsingFreeShippingAndTaxesTest" deprecated="Use StorefrontVerifyGuestCheckoutUsingFreeShippingAndTaxesTest">
1111
<annotations>
1212
<stories value="Checkout"/>
13-
<title value="Verify guest checkout using free shipping and tax variations"/>
13+
<title value="DEPRECATED. Verify guest checkout using free shipping and tax variations"/>
1414
<description value="Verify guest checkout using free shipping and tax variations"/>
1515
<severity value="CRITICAL"/>
1616
<testCaseId value="MC-14709"/>
1717
<group value="mtf_migrated"/>
1818
<skip>
19-
<issueId value="MC-18802"/>
19+
<issueId value="DEPRECATED">Use StorefrontVerifyGuestCheckoutUsingFreeShippingAndTaxesTest</issueId>
2020
</skip>
2121
</annotations>
2222

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

Lines changed: 216 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,216 @@
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="StorefrontVerifyGuestCheckoutUsingFreeShippingAndTaxesTest">
11+
<annotations>
12+
<features value="Checkout"/>
13+
<stories value="Checkout"/>
14+
<title value="Verify guest checkout using free shipping and tax variations"/>
15+
<description value="Verify guest checkout using free shipping and tax variations"/>
16+
<severity value="CRITICAL"/>
17+
<testCaseId value="MC-14709"/>
18+
<group value="mtf_migrated"/>
19+
</annotations>
20+
<before>
21+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginToAdminPanel"/>
22+
<createData entity="FlatRateShippingMethodConfig" stepKey="enableFlatRate"/>
23+
<createData entity="FreeShippingMethodsSettingConfig" stepKey="freeShippingMethodsSettingConfig"/>
24+
<createData entity="MinimumOrderAmount100" stepKey="minimumOrderAmount100"/>
25+
<createData entity="taxRate_US_NY_8_1" stepKey="createTaxRateUSNY"/>
26+
<createData entity="DefaultTaxRuleWithCustomTaxRate" stepKey="createTaxRuleUSNY">
27+
<requiredEntity createDataKey="createTaxRateUSNY" />
28+
</createData>
29+
30+
<!--Create Simple Product -->
31+
<createData entity="defaultSimpleProduct" stepKey="simpleProduct">
32+
<field key="price">10.00</field>
33+
</createData>
34+
35+
<!-- Create the configurable product with product Attribute options-->
36+
<createData entity="ApiCategory" stepKey="createCategory"/>
37+
<createData entity="ApiConfigurableProduct" stepKey="createConfigProduct">
38+
<requiredEntity createDataKey="createCategory"/>
39+
</createData>
40+
<createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttribute"/>
41+
<createData entity="productAttributeOption1" stepKey="createConfigProductAttributeOption1">
42+
<requiredEntity createDataKey="createConfigProductAttribute"/>
43+
</createData>
44+
45+
<createData entity="AddToDefaultSet" stepKey="addToDefaultSet">
46+
<requiredEntity createDataKey="createConfigProductAttribute"/>
47+
</createData>
48+
<getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeOption1">
49+
<requiredEntity createDataKey="createConfigProductAttribute"/>
50+
</getData>
51+
52+
<createData entity="ApiSimpleOne" stepKey="createConfigChildProduct1">
53+
<requiredEntity createDataKey="createConfigProductAttribute"/>
54+
<requiredEntity createDataKey="getConfigAttributeOption1"/>
55+
<field key="price">10.00</field>
56+
</createData>
57+
58+
<createData entity="ConfigurableProductTwoOptions" stepKey="createConfigProductOption">
59+
<requiredEntity createDataKey="createConfigProduct"/>
60+
<requiredEntity createDataKey="createConfigProductAttribute"/>
61+
<requiredEntity createDataKey="getConfigAttributeOption1"/>
62+
</createData>
63+
<createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild1">
64+
<requiredEntity createDataKey="createConfigProduct"/>
65+
<requiredEntity createDataKey="createConfigChildProduct1"/>
66+
</createData>
67+
68+
<!-- Create Bundle Product -->
69+
<createData entity="SimpleProduct2" stepKey="simpleProduct1">
70+
<field key="price">100.00</field>
71+
</createData>
72+
<createData entity="SimpleProduct2" stepKey="simpleProduct2">
73+
<field key="price">200.00</field>
74+
</createData>
75+
<!--Create Bundle product with multi select option-->
76+
<createData entity="BundleProductPriceViewRange" stepKey="createBundleProduct">
77+
<requiredEntity createDataKey="createCategory"/>
78+
</createData>
79+
<createData entity="MultipleSelectOption" stepKey="createBundleOption1_1">
80+
<requiredEntity createDataKey="createBundleProduct"/>
81+
<field key="required">True</field>
82+
</createData>
83+
<createData entity="ApiBundleLink" stepKey="linkOptionToProduct">
84+
<requiredEntity createDataKey="createBundleProduct"/>
85+
<requiredEntity createDataKey="createBundleOption1_1"/>
86+
<requiredEntity createDataKey="simpleProduct1"/>
87+
</createData>
88+
<createData entity="ApiBundleLink" stepKey="linkOptionToProduct2">
89+
<requiredEntity createDataKey="createBundleProduct"/>
90+
<requiredEntity createDataKey="createBundleOption1_1"/>
91+
<requiredEntity createDataKey="simpleProduct2"/>
92+
</createData>
93+
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
94+
<argument name="indices" value=""/>
95+
</actionGroup>
96+
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
97+
<argument name="tags" value=""/>
98+
</actionGroup>
99+
</before>
100+
<after>
101+
<deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
102+
<deleteData createDataKey="simpleProduct" stepKey="deleteProduct"/>
103+
<deleteData createDataKey="createConfigChildProduct1" stepKey="deleteConfigProduct1"/>
104+
<deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/>
105+
<deleteData createDataKey="createConfigProductAttribute" stepKey="deleteProductAttribute"/>
106+
<deleteData createDataKey="simpleProduct1" stepKey="deleteProduct1"/>
107+
<deleteData createDataKey="simpleProduct2" stepKey="deleteProduct2"/>
108+
<deleteData createDataKey="createBundleProduct" stepKey="deleteBundleProduct"/>
109+
<deleteData createDataKey="createTaxRuleUSNY" stepKey="deleteTaxRuleUSNY"/>
110+
<deleteData createDataKey="createTaxRateUSNY" stepKey="deleteTaxRateUSNY"/>
111+
<createData entity="DefaultShippingMethodsConfig" stepKey="defaultShippingMethodsConfig"/>
112+
<createData entity="DefaultMinimumOrderAmount" stepKey="defaultMinimumOrderAmount"/>
113+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
114+
115+
<!-- Reindex invalidated indices after product attribute has been created/deleted -->
116+
<magentoCron groups="index" stepKey="reindexInvalidatedIndices"/>
117+
</after>
118+
119+
<!--Open Product page in StoreFront and assert product and price range -->
120+
<actionGroup ref="AssertProductNameAndSkuInStorefrontProductPageByCustomAttributeUrlKeyActionGroup" stepKey="openProductPageAndVerifyProduct">
121+
<argument name="product" value="$$simpleProduct$$"/>
122+
</actionGroup>
123+
124+
<!--Add product to the cart -->
125+
<actionGroup ref="StorefrontAddProductToCartWithQtyActionGroup" stepKey="addProductToTheCart">
126+
<argument name="productQty" value="1"/>
127+
</actionGroup>
128+
129+
<!-- Add Configurable Product to the cart -->
130+
<actionGroup ref="StorefrontAddConfigurableProductToTheCartActionGroup" stepKey="addConfigurableProductToCart">
131+
<argument name="urlKey" value="$$createConfigProduct.custom_attributes[url_key]$$" />
132+
<argument name="productAttribute" value="$$createConfigProductAttribute.default_value$$"/>
133+
<argument name="productOption" value="$$getConfigAttributeOption1.label$$"/>
134+
<argument name="qty" value="1"/>
135+
</actionGroup>
136+
137+
<!--Open Product page in StoreFront -->
138+
<actionGroup ref="AssertProductNameAndSkuInStorefrontProductPageByCustomAttributeUrlKeyActionGroup" stepKey="openBundleProduct">
139+
<argument name="product" value="$$createBundleProduct$$"/>
140+
</actionGroup>
141+
142+
<!-- Click on customize And Add To Cart Button -->
143+
<actionGroup ref="StorefrontSelectCustomizeAndAddToTheCartButtonActionGroup" stepKey="clickOnCustomizeAndAddtoCartButton"/>
144+
145+
<!-- Select Two Products, enter the quantity and add product to the cart -->
146+
<selectOption selector="{{StorefrontBundledSection.multiSelectOption}}" userInput="$$simpleProduct1.name$$ +$100.00" stepKey="selectOption"/>
147+
<actionGroup ref="StorefrontEnterProductQuantityAndAddToTheCartActionGroup" stepKey="enterProductQuantityAndAddToTheCart">
148+
<argument name="quantity" value="1"/>
149+
</actionGroup>
150+
151+
<!--Open View and edit -->
152+
<actionGroup ref="ClickViewAndEditCartFromMiniCartActionGroup" stepKey="clickMiniCart"/>
153+
154+
<!-- Fill the Estimate Shipping and Tax section -->
155+
<actionGroup ref="CheckoutFillEstimateShippingAndTaxActionGroup" stepKey="fillEstimateShippingAndTaxFields">
156+
<argument name="address" value="US_Address_NY_Default_Shipping"/>
157+
</actionGroup>
158+
159+
<!-- Select Free Shipping Method on Cart -->
160+
<actionGroup ref="StorefrontCartShippingMethodSelectActionGroup" stepKey="selectFreeShippingShippingMethod">
161+
<argument name="carrierCode" value="freeshipping"/>
162+
<argument name="methodCode" value="freeshipping"/>
163+
</actionGroup>
164+
<see selector="{{CheckoutCartSummarySection.taxAmount}}" userInput="$9.72" stepKey="seeTaxAmount"/>
165+
<reloadPage stepKey="reloadThePage"/>
166+
<waitForPageLoad stepKey="waitForPageToReload"/>
167+
<see selector="{{CheckoutCartSummarySection.taxAmount}}" userInput="$9.72" stepKey="seeTaxAmountAfterLoadPage"/>
168+
169+
<!-- Proceed to checkout -->
170+
<scrollTo selector="{{CheckoutCartSummarySection.proceedToCheckout}}" stepKey="scrollToProceedToCheckout" />
171+
<click selector="{{CheckoutCartSummarySection.proceedToCheckout}}" stepKey="goToCheckout"/>
172+
<waitForPageLoad stepKey="waitForPageToLoad"/>
173+
174+
<!-- Fill Guest form -->
175+
<actionGroup ref="FillGuestCheckoutShippingAddressFormActionGroup" stepKey="fillTheSignInForm">
176+
<argument name="customer" value="Simple_US_Customer"/>
177+
<argument name="customerAddress" value="US_Address_NY_Default_Shipping"/>
178+
</actionGroup>
179+
<actionGroup ref="StorefrontCheckoutClickNextButtonActionGroup" stepKey="clickOnNextButton"/>
180+
181+
<!-- Place order and Assert success message -->
182+
<actionGroup ref="ClickPlaceOrderActionGroup" stepKey="clickOnPlaceOrder"/>
183+
184+
<!-- Assert empty Mini Cart -->
185+
<seeElement selector="{{StorefrontMinicartSection.emptyMiniCart}}" stepKey="assertEmptyCart" />
186+
<grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumberWithoutLink}}" stepKey="orderId"/>
187+
188+
<!-- Open Order Index Page -->
189+
<actionGroup ref="AdminOrdersPageOpenActionGroup" stepKey="goToOrders"/>
190+
191+
<!-- Filter Order using orderId and assert order-->
192+
<actionGroup ref="FilterOrderGridByIdActionGroup" stepKey="filterOrderGridById">
193+
<argument name="orderId" value="$orderId"/>
194+
</actionGroup>
195+
<click selector="{{AdminOrdersGridSection.viewLink('$orderId')}}" stepKey="clickOnViewLink"/>
196+
<waitForPageLoad stepKey="waitForOrderPageToLoad"/>
197+
198+
<!-- Assert order buttons -->
199+
<actionGroup ref="AdminAssertOrderAvailableButtonsActionGroup" stepKey="assertOrderButtons"/>
200+
201+
<!-- Assert Grand Total -->
202+
<see selector="{{AdminOrderTotalSection.grandTotal}}" userInput="$129.72" stepKey="seeGrandTotal"/>
203+
<see selector="{{AdminOrderDetailsInformationSection.orderStatus}}" userInput="Pending" stepKey="seeOrderStatus"/>
204+
205+
<!-- Ship the order and assert the status -->
206+
<actionGroup ref="AdminShipThePendingOrderActionGroup" stepKey="shipTheOrder"/>
207+
208+
<!-- Assert customer order address -->
209+
<actionGroup ref="AssertOrderAddressInformationActionGroup" stepKey="assertCustomerInformation">
210+
<argument name="customer" value=""/>
211+
<argument name="shippingAddress" value="US_Address_NY_Default_Shipping"/>
212+
<argument name="billingAddress" value="US_Address_NY_Default_Shipping"/>
213+
<argument name="customerGroup" value=""/>
214+
</actionGroup>
215+
</test>
216+
</tests>

‎app/code/Magento/Tax/Test/Mftf/Data/TaxRuleData.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,4 +123,17 @@
123123
<entity name="TaxRuleZeroRate" type="taxRule">
124124
<data key="name" unique="suffix">TaxNameZeroRate</data>
125125
</entity>
126+
<entity name="DefaultTaxRuleWithCustomTaxRate" type="taxRule">
127+
<data key="code" unique="suffix">TaxRule</data>
128+
<data key="position">0</data>
129+
<data key="priority">0</data>
130+
<array key="customer_tax_class_ids">
131+
<item>3</item>
132+
</array>
133+
<array key="product_tax_class_ids">
134+
<item>2</item>
135+
</array>
136+
<var key="tax_rate_ids" entityType="taxRate" entityKey="id"/>
137+
<data key="calculate_subtotal">false</data>
138+
</entity>
126139
</entities>

0 commit comments

Comments
 (0)