Skip to content

Commit c6220b7

Browse files
romadjelfromadjelf
committed
MC-23908: Tax estimation fails on CI
1 parent f7782ab commit c6220b7

File tree

3 files changed

+55
-107
lines changed

3 files changed

+55
-107
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@
88

99
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11-
<!-- Select Shipping Method on Cart -->
12-
<actionGroup name="StorefrontCartShippingMethodSelectActionGroup">
11+
<actionGroup name="StorefrontCartPageSelectShippingMethodActionGroup">
1312
<annotations>
1413
<description>Select a shipping method in the Estimate Shipping and Tax block on the Storefront Shopping Cart page.</description>
1514
</annotations>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +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"/>
38+
<element name="shippingMethodChecked" type="radio" parameterized="true" selector="#co-shipping-method-form #s_method_{{carrierCode}}_{{methodCode}}:checked"/>
3939
<element name="estimateShippingAndTaxForm" type="block" selector="#shipping-zip-form"/>
4040
</section>
4141
</sections>

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

Lines changed: 53 additions & 104 deletions
Original file line numberDiff line numberDiff line change
@@ -14,82 +14,73 @@
1414
<title value="Verify guest checkout using free shipping and tax variations"/>
1515
<description value="Verify guest checkout using free shipping and tax variations"/>
1616
<severity value="CRITICAL"/>
17-
<testCaseId value="MC-14709"/>
17+
<testCaseId value="MC-28285"/>
1818
<group value="mtf_migrated"/>
19+
<group value="checkout"/>
1920
</annotations>
2021
<before>
21-
<actionGroup ref="AdminLoginActionGroup" stepKey="loginToAdminPanel"/>
2222
<createData entity="FlatRateShippingMethodConfig" stepKey="enableFlatRate"/>
2323
<createData entity="FreeShippingMethodsSettingConfig" stepKey="freeShippingMethodsSettingConfig"/>
24-
<createData entity="MinimumOrderAmount100" stepKey="minimumOrderAmount100"/>
24+
<createData entity="MinimumOrderAmount100" stepKey="minimumOrderAmount"/>
2525
<createData entity="taxRate_US_NY_8_1" stepKey="createTaxRateUSNY"/>
2626
<createData entity="DefaultTaxRuleWithCustomTaxRate" stepKey="createTaxRuleUSNY">
2727
<requiredEntity createDataKey="createTaxRateUSNY" />
2828
</createData>
29-
30-
<!--Create Simple Product -->
3129
<createData entity="defaultSimpleProduct" stepKey="simpleProduct">
3230
<field key="price">10.00</field>
3331
</createData>
34-
35-
<!-- Create the configurable product with product Attribute options-->
3632
<createData entity="ApiCategory" stepKey="createCategory"/>
37-
<createData entity="ApiConfigurableProduct" stepKey="createConfigProduct">
33+
<createData entity="ApiConfigurableProduct" stepKey="configurableProduct">
3834
<requiredEntity createDataKey="createCategory"/>
3935
</createData>
40-
<createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttribute"/>
41-
<createData entity="productAttributeOption1" stepKey="createConfigProductAttributeOption1">
42-
<requiredEntity createDataKey="createConfigProductAttribute"/>
36+
<createData entity="productAttributeWithTwoOptions" stepKey="createProductAttribute"/>
37+
<createData entity="productAttributeOption1" stepKey="createProductAttributeOption">
38+
<requiredEntity createDataKey="createProductAttribute"/>
4339
</createData>
44-
4540
<createData entity="AddToDefaultSet" stepKey="addToDefaultSet">
46-
<requiredEntity createDataKey="createConfigProductAttribute"/>
41+
<requiredEntity createDataKey="createProductAttribute"/>
4742
</createData>
48-
<getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeOption1">
49-
<requiredEntity createDataKey="createConfigProductAttribute"/>
43+
<getData entity="ProductAttributeOptionGetter" index="1" stepKey="getProductAttributeOption">
44+
<requiredEntity createDataKey="createProductAttribute"/>
5045
</getData>
51-
52-
<createData entity="ApiSimpleOne" stepKey="createConfigChildProduct1">
53-
<requiredEntity createDataKey="createConfigProductAttribute"/>
54-
<requiredEntity createDataKey="getConfigAttributeOption1"/>
46+
<createData entity="ApiSimpleOne" stepKey="configurableChildProduct">
47+
<requiredEntity createDataKey="createProductAttribute"/>
48+
<requiredEntity createDataKey="getProductAttributeOption"/>
5549
<field key="price">10.00</field>
5650
</createData>
57-
5851
<createData entity="ConfigurableProductTwoOptions" stepKey="createConfigProductOption">
59-
<requiredEntity createDataKey="createConfigProduct"/>
60-
<requiredEntity createDataKey="createConfigProductAttribute"/>
61-
<requiredEntity createDataKey="getConfigAttributeOption1"/>
52+
<requiredEntity createDataKey="configurableProduct"/>
53+
<requiredEntity createDataKey="createProductAttribute"/>
54+
<requiredEntity createDataKey="getProductAttributeOption"/>
6255
</createData>
63-
<createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild1">
64-
<requiredEntity createDataKey="createConfigProduct"/>
65-
<requiredEntity createDataKey="createConfigChildProduct1"/>
56+
<createData entity="ConfigurableProductAddChild" stepKey="configurableProductAddChild">
57+
<requiredEntity createDataKey="configurableProduct"/>
58+
<requiredEntity createDataKey="configurableChildProduct"/>
6659
</createData>
67-
68-
<!-- Create Bundle Product -->
69-
<createData entity="SimpleProduct2" stepKey="simpleProduct1">
60+
<createData entity="SimpleProduct2" stepKey="firstBundleChildProduct">
7061
<field key="price">100.00</field>
7162
</createData>
72-
<createData entity="SimpleProduct2" stepKey="simpleProduct2">
63+
<createData entity="SimpleProduct2" stepKey="secondBundleChildProduct">
7364
<field key="price">200.00</field>
7465
</createData>
75-
<!--Create Bundle product with multi select option-->
76-
<createData entity="BundleProductPriceViewRange" stepKey="createBundleProduct">
66+
<createData entity="BundleProductPriceViewRange" stepKey="bundleProduct">
7767
<requiredEntity createDataKey="createCategory"/>
7868
</createData>
79-
<createData entity="MultipleSelectOption" stepKey="createBundleOption1_1">
80-
<requiredEntity createDataKey="createBundleProduct"/>
69+
<createData entity="MultipleSelectOption" stepKey="bundleOption">
70+
<requiredEntity createDataKey="bundleProduct"/>
8171
<field key="required">True</field>
8272
</createData>
83-
<createData entity="ApiBundleLink" stepKey="linkOptionToProduct">
84-
<requiredEntity createDataKey="createBundleProduct"/>
85-
<requiredEntity createDataKey="createBundleOption1_1"/>
86-
<requiredEntity createDataKey="simpleProduct1"/>
73+
<createData entity="ApiBundleLink" stepKey="firstLinkOptionToProduct">
74+
<requiredEntity createDataKey="bundleProduct"/>
75+
<requiredEntity createDataKey="bundleOption"/>
76+
<requiredEntity createDataKey="firstBundleChildProduct"/>
8777
</createData>
88-
<createData entity="ApiBundleLink" stepKey="linkOptionToProduct2">
89-
<requiredEntity createDataKey="createBundleProduct"/>
90-
<requiredEntity createDataKey="createBundleOption1_1"/>
91-
<requiredEntity createDataKey="simpleProduct2"/>
78+
<createData entity="ApiBundleLink" stepKey="secondLinkOptionToProduct">
79+
<requiredEntity createDataKey="bundleProduct"/>
80+
<requiredEntity createDataKey="bundleOption"/>
81+
<requiredEntity createDataKey="secondBundleChildProduct"/>
9282
</createData>
83+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginToAdminPanel"/>
9384
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
9485
<argument name="indices" value=""/>
9586
</actionGroup>
@@ -100,112 +91,70 @@
10091
<after>
10192
<deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
10293
<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"/>
94+
<deleteData createDataKey="configurableChildProduct" stepKey="deleteConfigurableChildProduct"/>
95+
<deleteData createDataKey="configurableProduct" stepKey="deleteConfigurableProduct"/>
96+
<deleteData createDataKey="createProductAttribute" stepKey="deleteProductAttribute"/>
97+
<deleteData createDataKey="firstBundleChildProduct" stepKey="deleteFirstBundleChild"/>
98+
<deleteData createDataKey="secondBundleChildProduct" stepKey="deleteSecondBundleChild"/>
99+
<deleteData createDataKey="bundleProduct" stepKey="deleteBundleProduct"/>
109100
<deleteData createDataKey="createTaxRuleUSNY" stepKey="deleteTaxRuleUSNY"/>
110101
<deleteData createDataKey="createTaxRateUSNY" stepKey="deleteTaxRateUSNY"/>
111102
<createData entity="DefaultShippingMethodsConfig" stepKey="defaultShippingMethodsConfig"/>
112103
<createData entity="DefaultMinimumOrderAmount" stepKey="defaultMinimumOrderAmount"/>
113-
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
114-
115-
<!-- Reindex invalidated indices after product attribute has been created/deleted -->
104+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdminPanel"/>
116105
<magentoCron groups="index" stepKey="reindexInvalidatedIndices"/>
117106
</after>
118-
119-
<!--Open Product page in StoreFront and assert product and price range -->
120107
<actionGroup ref="AssertProductNameAndSkuInStorefrontProductPageByCustomAttributeUrlKeyActionGroup" stepKey="openProductPageAndVerifyProduct">
121-
<argument name="product" value="$$simpleProduct$$"/>
108+
<argument name="product" value="$simpleProduct$"/>
122109
</actionGroup>
123-
124-
<!--Add product to the cart -->
125110
<actionGroup ref="StorefrontAddProductToCartWithQtyActionGroup" stepKey="addProductToTheCart">
126111
<argument name="productQty" value="1"/>
127112
</actionGroup>
128-
129-
<!-- Add Configurable Product to the cart -->
130113
<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$$"/>
114+
<argument name="urlKey" value="$configurableProduct.custom_attributes[url_key]$" />
115+
<argument name="productAttribute" value="$createProductAttribute.default_value$"/>
116+
<argument name="productOption" value="$getProductAttributeOption.label$"/>
134117
<argument name="qty" value="1"/>
135118
</actionGroup>
136-
137-
<!--Open Product page in StoreFront -->
138-
<actionGroup ref="AssertProductNameAndSkuInStorefrontProductPageByCustomAttributeUrlKeyActionGroup" stepKey="openBundleProduct">
139-
<argument name="product" value="$$createBundleProduct$$"/>
119+
<actionGroup ref="AssertProductNameAndSkuInStorefrontProductPageByCustomAttributeUrlKeyActionGroup" stepKey="openProductPageAndVerifyBundleProduct">
120+
<argument name="product" value="$bundleProduct$"/>
140121
</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"/>
122+
<actionGroup ref="StorefrontAddBundleProductFromProductToCartWithMultiOptionActionGroup" stepKey="addBundleProductToCart">
123+
<argument name="productName" value="$bundleProduct.name$"/>
124+
<argument name="optionName" value="$bundleOption.name$"/>
125+
<argument name="value" value="$firstBundleChildProduct.name$ +$100.00"/>
149126
</actionGroup>
150-
151-
<!--Open View and edit -->
152127
<actionGroup ref="ClickViewAndEditCartFromMiniCartActionGroup" stepKey="clickMiniCart"/>
153-
154-
<!-- Fill the Estimate Shipping and Tax section -->
155128
<actionGroup ref="CheckoutFillEstimateShippingAndTaxActionGroup" stepKey="fillEstimateShippingAndTaxFields">
156129
<argument name="address" value="US_Address_NY_Default_Shipping"/>
157130
</actionGroup>
158-
159-
<!-- Select Free Shipping Method on Cart -->
160-
<actionGroup ref="StorefrontCartShippingMethodSelectActionGroup" stepKey="selectFreeShippingShippingMethod">
131+
<actionGroup ref="StorefrontCartPageSelectShippingMethodActionGroup" stepKey="selectFreeShippingShippingMethod">
161132
<argument name="carrierCode" value="freeshipping"/>
162133
<argument name="methodCode" value="freeshipping"/>
163134
</actionGroup>
164135
<see selector="{{CheckoutCartSummarySection.taxAmount}}" userInput="$9.72" stepKey="seeTaxAmount"/>
165136
<reloadPage stepKey="reloadThePage"/>
166137
<waitForPageLoad stepKey="waitForPageToReload"/>
167138
<see selector="{{CheckoutCartSummarySection.taxAmount}}" userInput="$9.72" stepKey="seeTaxAmountAfterLoadPage"/>
168-
169-
<!-- Proceed to checkout -->
170139
<scrollTo selector="{{CheckoutCartSummarySection.proceedToCheckout}}" stepKey="scrollToProceedToCheckout" />
171140
<click selector="{{CheckoutCartSummarySection.proceedToCheckout}}" stepKey="goToCheckout"/>
172141
<waitForPageLoad stepKey="waitForPageToLoad"/>
173-
174-
<!-- Fill Guest form -->
175142
<actionGroup ref="FillGuestCheckoutShippingAddressFormActionGroup" stepKey="fillTheSignInForm">
176143
<argument name="customer" value="Simple_US_Customer"/>
177144
<argument name="customerAddress" value="US_Address_NY_Default_Shipping"/>
178145
</actionGroup>
179146
<actionGroup ref="StorefrontCheckoutClickNextButtonActionGroup" stepKey="clickOnNextButton"/>
180-
181-
<!-- Place order and Assert success message -->
182147
<actionGroup ref="ClickPlaceOrderActionGroup" stepKey="clickOnPlaceOrder"/>
183-
184-
<!-- Assert empty Mini Cart -->
185148
<seeElement selector="{{StorefrontMinicartSection.emptyMiniCart}}" stepKey="assertEmptyCart" />
186149
<grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumberWithoutLink}}" stepKey="orderId"/>
187-
188-
<!-- Open Order Index Page -->
189150
<actionGroup ref="AdminOrdersPageOpenActionGroup" stepKey="goToOrders"/>
190-
191-
<!-- Filter Order using orderId and assert order-->
192-
<actionGroup ref="FilterOrderGridByIdActionGroup" stepKey="filterOrderGridById">
151+
<actionGroup ref="OpenOrderByIdActionGroup" stepKey="openOrderById">
193152
<argument name="orderId" value="$orderId"/>
194153
</actionGroup>
195-
<click selector="{{AdminOrdersGridSection.viewLink('$orderId')}}" stepKey="clickOnViewLink"/>
196-
<waitForPageLoad stepKey="waitForOrderPageToLoad"/>
197-
198-
<!-- Assert order buttons -->
199154
<actionGroup ref="AdminAssertOrderAvailableButtonsActionGroup" stepKey="assertOrderButtons"/>
200-
201-
<!-- Assert Grand Total -->
202155
<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 -->
156+
<actionGroup ref="AdminOrderViewCheckStatusActionGroup" stepKey="seeOrderPendingStatus"/>
206157
<actionGroup ref="AdminShipThePendingOrderActionGroup" stepKey="shipTheOrder"/>
207-
208-
<!-- Assert customer order address -->
209158
<actionGroup ref="AssertOrderAddressInformationActionGroup" stepKey="assertCustomerInformation">
210159
<argument name="customer" value=""/>
211160
<argument name="shippingAddress" value="US_Address_NY_Default_Shipping"/>

0 commit comments

Comments
 (0)