Skip to content

Commit c25ff06

Browse files
sapanathakursapanathakur
committed
MC-5329: Update tax rate, decimal rate
1 parent 447ad47 commit c25ff06

File tree

3 files changed

+68
-31
lines changed

3 files changed

+68
-31
lines changed

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

Lines changed: 2 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -31,41 +31,12 @@
3131
<entity name="defaultTaxRateWithZipRange" type="taxRate">
3232
<data key="code" unique="suffix">Tax Rate </data>
3333
<data key="tax_country_id">US</data>
34+
<data key="tax_country">United States</data>
3435
<data key="tax_region_id">12</data>
36+
<data key="tax_region">California</data>
3537
<data key="zip_is_range">1</data>
3638
<data key="zip_from">90001</data>
3739
<data key="zip_to">96162</data>
3840
<data key="rate">15.05</data>
3941
</entity>
40-
<entity name="defaultTaxRateWithLargeRate" type="taxRate">
41-
<data key="code" unique="suffix">TaxRate</data>
42-
<data key="tax_country_id">GB</data>
43-
<data key="tax_postcode">*</data>
44-
<data key="zip_is_range">0</data>
45-
<data key="rate">777</data>
46-
</entity>
47-
<entity name="taxRateCustomRateCanada" type="taxRate">
48-
<data key="code" unique="suffix">TaxRate</data>
49-
<data key="tax_country_id">CA</data>
50-
<data key="tax_region_id">*</data>
51-
<data key="tax_postcode">180</data>
52-
<data key="zip_is_range">0</data>
53-
<data key="rate">25</data>
54-
</entity>
55-
<entity name="taxRateCustomRateUK" type="taxRate">
56-
<data key="code" unique="suffix">TaxRate</data>
57-
<data key="tax_country_id">GB</data>
58-
<data key="zip_is_range">1</data>
59-
<data key="zip_from">1</data>
60-
<data key="zip_to">7800935</data>
61-
<data key="rate">12.99</data>
62-
</entity>
63-
<entity name="taxRateCustomRateFrance" type="taxRate">
64-
<data key="code" unique="suffix">TaxRate</data>
65-
<data key="tax_country_id">FR</data>
66-
<data key="tax_region_id">277</data>
67-
<data key="tax_postcode">*</data>
68-
<data key="zip_is_range">0</data>
69-
<data key="rate">0.1</data>
70-
</entity>
7142
</entities>

‎app/code/Magento/Tax/Test/Mftf/Metadata/tax_rate-meta.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
<field key="tax_region_id">integer</field>
1616
<field key="tax_postcode">string</field>
1717
<field key="zip_is_range">integer</field>
18+
<field key="zip_from">integer</field>
19+
<field key="zip_to">integer</field>
1820
<field key="rate">integer</field>
1921
<field key="code">string</field>
2022
</object>

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

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
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="UpdateDecimalTaxRateEntityTest">
12+
<annotations>
13+
<stories value="Update Tax Rate"/>
14+
<title value="Update tax rate, decimal rate"/>
15+
<description value="Test log in to Tax Rate and Update Decimal Tax Rate"/>
16+
<testCaseId value="MC-5329"/>
17+
<severity value="CRITICAL"/>
18+
<group value="tax"/>
19+
<group value="mtf_migrated"/>
20+
</annotations>
21+
<before>
22+
<createData entity="defaultTaxRate" stepKey="initialTaxRate"/>
23+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
24+
</before>
25+
<after>
26+
<deleteData stepKey="deleteTaxRate" createDataKey="initialTaxRate" />
27+
</after>
28+
29+
<!-- Search the tax rate on tax grid page -->
30+
<amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRateIndex1"/>
31+
<waitForPageLoad stepKey="waitForTaxRateIndex1"/>
32+
<click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters1"/>
33+
<fillField selector="{{AdminTaxRateGridSection.filterByTaxIdentifier}}" userInput="$$initialTaxRate.code$$" stepKey="fillCode"/>
34+
<click selector="{{AdminTaxRateGridSection.search}}" stepKey="clickSearch1"/>
35+
<click selector="{{AdminTaxRateGridSection.nthRow('1')}}" stepKey="clickFirstRow1"/>
36+
37+
<!-- Update decimal tax rate on the tax rate form page -->
38+
<fillField selector="{{AdminTaxRateFormSection.taxIdentifier}}" userInput="{{defaultTaxRateWithZipRange.code}}" stepKey="fillTaxIdentifierField2"/>
39+
<selectOption selector="{{AdminTaxRateFormSection.country}}" userInput="{{defaultTaxRateWithZipRange.tax_country_id}}" stepKey="selectCountry1"/>
40+
<selectOption selector="{{AdminTaxRateFormSection.state}}" userInput="{{defaultTaxRateWithZipRange.tax_region_id}}" stepKey="selectState"/>
41+
<checkOption selector="{{AdminTaxRateFormSection.zipRange}}" stepKey="checkZipRange"/>
42+
<fillField selector="{{AdminTaxRateFormSection.rangeFrom}}" userInput="{{defaultTaxRateWithZipRange.zip_from}}" stepKey="fillZipFrom"/>
43+
<fillField selector="{{AdminTaxRateFormSection.rangeTo}}" userInput="{{defaultTaxRateWithZipRange.zip_to}}" stepKey="fillZipTo"/>
44+
<fillField selector="{{AdminTaxRateFormSection.rate}}" userInput="{{defaultTaxRateWithZipRange.rate}}" stepKey="fillRate1"/>
45+
<click selector="{{AdminTaxRateFormSection.save}}" stepKey="clickSave"/>
46+
<see selector="{{AdminMessagesSection.success}}" userInput="You saved the tax rate." stepKey="seeSuccess"/>
47+
48+
<!-- Verify we see updated tax rate(from the above step) on the tax rate grid page -->
49+
<amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRateIndex2"/>
50+
<waitForPageLoad stepKey="waitForTaxRateIndex2"/>
51+
<click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters2"/>
52+
<fillField selector="{{AdminTaxRateGridSection.filterByTaxIdentifier}}" userInput="{{defaultTaxRateWithZipRange.code}}" stepKey="fillTaxIdentifierField3"/>
53+
<click selector="{{AdminTaxRateGridSection.search}}" stepKey="clickSearch2"/>
54+
<click selector="{{AdminTaxRateGridSection.nthRow('1')}}" stepKey="clickFirstRow2"/>
55+
<!-- Verify we see updated tax rate on the tax rate form page -->
56+
<seeInField selector="{{AdminTaxRateFormSection.taxIdentifier}}" userInput="{{defaultTaxRateWithZipRange.code}}" stepKey="seeRTaxIdentifier"/>
57+
<seeOptionIsSelected selector="{{AdminTaxRateFormSection.country}}" userInput="{{defaultTaxRateWithZipRange.tax_country}}" stepKey="seeCountry2"/>
58+
<seeOptionIsSelected selector="{{AdminTaxRateFormSection.state}}" userInput="{{defaultTaxRateWithZipRange.tax_region}}" stepKey="seeState2"/>
59+
<seeCheckboxIsChecked selector="{{AdminTaxRateFormSection.zipRange}}" stepKey="seeZipRange"/>
60+
<seeInField selector="{{AdminTaxRateFormSection.rangeFrom}}" userInput="{{defaultTaxRateWithZipRange.zip_from}}" stepKey="seeTaxPostCode2"/>
61+
<seeInField selector="{{AdminTaxRateFormSection.rangeTo}}" userInput="{{defaultTaxRateWithZipRange.zip_to}}" stepKey="seeTaxPostCode3"/>
62+
<seeInField selector="{{AdminTaxRateFormSection.rate}}" userInput="{{defaultTaxRateWithZipRange.rate}}" stepKey="seeRate2"/>
63+
</test>
64+
</tests>

0 commit comments

Comments
 (0)