Skip to content

Commit f7a0a6c

Browse files
committed
ACP2E-1580: Tax and Shipping Estimator in the Cart not reflecting default destination configuration
1 parent 84fbf69 commit f7a0a6c

File tree

5 files changed

+55
-71
lines changed

5 files changed

+55
-71
lines changed
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
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="AdminAssertDefaultTaxDestinationActionGroup">
12+
<annotations>
13+
<description>Assert admin settings (country, state, postcode) for default tax destination calculation</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="country" type="string" defaultValue="{{US_Address_TX.country}}"/>
17+
<argument name="state" type="string" defaultValue="*"/>
18+
<argument name="postcode" type="string" defaultValue=""/>
19+
</arguments>
20+
21+
<!-- Navigate to the tax configuration page -->
22+
<amOnPage url="{{AdminTaxConfigurationPage.url}}" stepKey="goToAdminTaxPage"/>
23+
<waitForPageLoad stepKey="waitForTaxConfigLoad"/>
24+
<!-- Verify default tax destination calculation settings-->
25+
<conditionalClick selector="{{AdminConfigureTaxSection.defaultDestination}}" dependentSelector="#tax_defaults" visible="false" stepKey="clickCalculationSettings"/>
26+
<seeOptionIsSelected selector="{{AdminConfigureTaxSection.dropdownDefaultCountry}}" userInput="{{country}}" stepKey="assertDefaultCountry"/>
27+
<seeOptionIsSelected selector="{{AdminConfigureTaxSection.dropdownDefaultState}}" userInput="{{state}}" stepKey="assertDefaultRegion"/>
28+
<seeInField selector="{{AdminConfigureTaxSection.defaultPostCode}}" userInput="{{postcode}}" stepKey="assertDefaultPostCode"/>
29+
</actionGroup>
30+
</actionGroups>

app/code/Magento/Checkout/Test/Mftf/ActionGroup/AdminResetDefaultTaxDestinationActionGroup.xml

Lines changed: 0 additions & 28 deletions
This file was deleted.

app/code/Magento/Checkout/Test/Mftf/ActionGroup/AdminSetDefaultTaxDestinationActionGroup.xml

Lines changed: 0 additions & 39 deletions
This file was deleted.

app/code/Magento/Checkout/Test/Mftf/Test/StorefrontEstimateShippingTaxTest.xml

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,22 +20,31 @@
2020
</annotations>
2121

2222
<before>
23+
<!--Change default tax destination calculation settings-->
24+
<magentoCLI command="config:set {{DefaultTaxDestinationCountry.path}} {{US_Address_NY.country_id}}" stepKey="selectDefaultCountry"/>
25+
<magentoCLI command="config:set {{DefaultTaxDestinationRegion.path}} {{RegionNY.region_id}}" stepKey="selectDefaultState"/>
26+
<magentoCLI command="config:set {{DefaultTaxDestinationPostcode.path}} {{US_Address_NY.postcode}}" stepKey="fillDefaultPostCode"/>
27+
2328
<!-- Create simple product -->
2429
<createData entity="SimpleProduct2" stepKey="createProduct"/>
2530
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
2631
</before>
2732

2833
<after>
34+
<!--Reset default tax destination calculation settings-->
35+
<magentoCLI command="config:set {{DefaultTaxDestinationCountry.path}} {{DefaultTaxDestinationCountry.value}}" stepKey="resetDefaultCountry"/>
36+
<magentoCLI command="config:set {{DefaultTaxDestinationRegion.path}} {{DefaultTaxDestinationRegion.value}}" stepKey="resetDefaultState"/>
37+
<magentoCLI command="config:set {{DefaultTaxDestinationPostcode.path}} {{DefaultTaxDestinationPostcode.value}}" stepKey="resetDefaultPostCode"/>
38+
2939
<!-- Delete simple product -->
3040
<deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
31-
<!--Reset default tax destination calculation-->
32-
<actionGroup ref="AdminResetDefaultTaxDestinationActionGroup" stepKey="resetDefaultTaxDestination"/>
3341
<actionGroup ref="AdminLogoutActionGroup" stepKey="adminLogout"/>
3442
</after>
3543

36-
<actionGroup ref="AdminSetDefaultTaxDestinationActionGroup" stepKey="setDefaultTaxDestination">
44+
<!--Verify the admin setting for default tac and destination calculation-->
45+
<actionGroup ref="AdminAssertDefaultTaxDestinationActionGroup" stepKey="sssertDefaultTaxDestination">
3746
<argument name="country" value="{{US_Address_NY.country}}"/>
38-
<argument name="state" value="{{US_Address_NY.state}}"/>
47+
<argument name="state" value="{{RegionNY.region}}"/>
3948
<argument name="postcode" value="{{US_Address_NY.postcode}}"/>
4049
</actionGroup>
4150

app/code/Magento/Sales/Test/Mftf/Data/ConfigData.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,16 @@
3232
<data key="path">payment/checkmo/title</data>
3333
<data key="value">Test</data>
3434
</entity>
35+
<entity name="DefaultTaxDestinationCountry">
36+
<data key="path">tax/defaults/country</data>
37+
<data key="value">US</data>
38+
</entity>
39+
<entity name="DefaultTaxDestinationRegion">
40+
<data key="path">tax/defaults/region</data>
41+
<data key="value">*</data>
42+
</entity>
43+
<entity name="DefaultTaxDestinationPostcode">
44+
<data key="path">tax/defaults/postcode</data>
45+
<data key="value">''</data>
46+
</entity>
3547
</entities>

0 commit comments

Comments
 (0)