Skip to content

Commit 447ad47

Browse files
tomreecetomreece
committed
MC-5328: Update tax rate, 100 rate
- Fix test to update all fields
1 parent 8db4638 commit 447ad47

File tree

2 files changed

+30
-20
lines changed

2 files changed

+30
-20
lines changed

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

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,27 @@
1010
<entity name="SimpleTaxRate" type="taxRate">
1111
<data key="code" unique="suffix">TaxRate</data>
1212
</entity>
13+
<entity name="defaultTaxRate" type="taxRate">
14+
<data key="code" unique="suffix">Tax Rate </data>
15+
<data key="tax_country_id">US</data>
16+
<data key="tax_region_id">12</data>
17+
<data key="tax_postcode">*</data>
18+
<data key="zip_is_range">0</data>
19+
<data key="rate">10</data>
20+
</entity>
1321
<entity name="taxRateCustomRateUS" type="taxRate">
1422
<data key="code" unique="suffix">Tax Rate </data>
1523
<data key="tax_country_id">US</data>
24+
<data key="tax_country">United States</data>
1625
<data key="tax_region_id">12</data>
26+
<data key="tax_region">California</data>
1727
<data key="tax_postcode">90001</data>
1828
<data key="zip_is_range">0</data>
19-
<data key="rate">100</data>
29+
<data key="rate">100.0000</data>
2030
</entity>
2131
<entity name="defaultTaxRateWithZipRange" type="taxRate">
2232
<data key="code" unique="suffix">Tax Rate </data>
23-
<data key="tax_country_id">United States</data>
33+
<data key="tax_country_id">US</data>
2434
<data key="tax_region_id">12</data>
2535
<data key="zip_is_range">1</data>
2636
<data key="zip_from">90001</data>
@@ -29,30 +39,30 @@
2939
</entity>
3040
<entity name="defaultTaxRateWithLargeRate" type="taxRate">
3141
<data key="code" unique="suffix">TaxRate</data>
32-
<data key="tax_country_id">United Kingdom</data>
42+
<data key="tax_country_id">GB</data>
3343
<data key="tax_postcode">*</data>
3444
<data key="zip_is_range">0</data>
3545
<data key="rate">777</data>
3646
</entity>
3747
<entity name="taxRateCustomRateCanada" type="taxRate">
3848
<data key="code" unique="suffix">TaxRate</data>
39-
<data key="tax_country_id">Canada</data>
49+
<data key="tax_country_id">CA</data>
4050
<data key="tax_region_id">*</data>
4151
<data key="tax_postcode">180</data>
4252
<data key="zip_is_range">0</data>
4353
<data key="rate">25</data>
4454
</entity>
4555
<entity name="taxRateCustomRateUK" type="taxRate">
4656
<data key="code" unique="suffix">TaxRate</data>
47-
<data key="tax_country_id">United Kingdom</data>
57+
<data key="tax_country_id">GB</data>
4858
<data key="zip_is_range">1</data>
4959
<data key="zip_from">1</data>
5060
<data key="zip_to">7800935</data>
5161
<data key="rate">12.99</data>
5262
</entity>
5363
<entity name="taxRateCustomRateFrance" type="taxRate">
5464
<data key="code" unique="suffix">TaxRate</data>
55-
<data key="tax_country_id">France</data>
65+
<data key="tax_country_id">FR</data>
5666
<data key="tax_region_id">277</data>
5767
<data key="tax_postcode">*</data>
5868
<data key="zip_is_range">0</data>

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -19,42 +19,42 @@
1919
<group value="mtf_migrated"/>
2020
</annotations>
2121
<before>
22-
<createData entity="taxRateCustomRateUS" stepKey="createTaxRateCustomRateUS"/>
22+
<createData entity="defaultTaxRate" stepKey="initialTaxRate"/>
2323
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
2424
</before>
2525
<after>
26-
<deleteData stepKey="deleteTaxRate" createDataKey="createTaxRateCustomRateUS" />
26+
<deleteData stepKey="deleteTaxRate" createDataKey="initialTaxRate" />
2727
</after>
2828

2929
<!-- Search the tax rate on tax grid page -->
3030
<amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRateIndex1"/>
3131
<waitForPageLoad stepKey="waitForTaxRateIndex1"/>
3232
<click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters1"/>
33-
<fillField selector="{{AdminTaxRateGridSection.filterByTaxIdentifier}}" userInput="$$createTaxRateCustomRateUS.code$$" stepKey="fillCode"/>
33+
<fillField selector="{{AdminTaxRateGridSection.filterByTaxIdentifier}}" userInput="$$initialTaxRate.code$$" stepKey="fillCode"/>
3434
<click selector="{{AdminTaxRateGridSection.search}}" stepKey="clickSearch1"/>
3535
<click selector="{{AdminTaxRateGridSection.nthRow('1')}}" stepKey="clickFirstRow1"/>
3636

3737
<!-- Update values on the tax rate form page -->
38-
<fillField selector="{{AdminTaxRateFormSection.taxIdentifier}}" userInput="{{SimpleTaxRate.code}}" stepKey="fillTaxIdentifierField2"/>
39-
<selectOption selector="{{AdminTaxRateFormSection.country}}" userInput="United States" stepKey="selectCountry1"/>
40-
<selectOption selector="{{AdminTaxRateFormSection.state}}" userInput="California" stepKey="selectState"/>
41-
<fillField selector="{{AdminTaxRateFormSection.zipCode}}" userInput="90001" stepKey="fillPostCode"/>
42-
<fillField selector="{{AdminTaxRateFormSection.rate}}" userInput="100" stepKey="fillRate1"/>
38+
<fillField selector="{{AdminTaxRateFormSection.taxIdentifier}}" userInput="{{taxRateCustomRateUS.code}}" stepKey="fillTaxIdentifierField2"/>
39+
<selectOption selector="{{AdminTaxRateFormSection.country}}" userInput="{{taxRateCustomRateUS.tax_country_id}}" stepKey="selectCountry1"/>
40+
<selectOption selector="{{AdminTaxRateFormSection.state}}" userInput="{{taxRateCustomRateUS.tax_region_id}}" stepKey="selectState"/>
41+
<fillField selector="{{AdminTaxRateFormSection.zipCode}}" userInput="{{taxRateCustomRateUS.tax_postcode}}" stepKey="fillPostCode"/>
42+
<fillField selector="{{AdminTaxRateFormSection.rate}}" userInput="{{taxRateCustomRateUS.rate}}" stepKey="fillRate1"/>
4343
<click selector="{{AdminTaxRateFormSection.save}}" stepKey="clickSave"/>
4444
<see selector="{{AdminMessagesSection.success}}" userInput="You saved the tax rate." stepKey="seeSuccess"/>
4545

4646
<!-- Verify we see updated TaxIdentifier(from the above step) on the tax rate grid page -->
4747
<amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRateIndex4"/>
4848
<waitForPageLoad stepKey="waitForTaxRateIndex2"/>
4949
<click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters2"/>
50-
<fillField selector="{{AdminTaxRateGridSection.filterByTaxIdentifier}}" userInput="{{SimpleTaxRate.code}}" stepKey="fillTaxIdentifierField3"/>
50+
<fillField selector="{{AdminTaxRateGridSection.filterByTaxIdentifier}}" userInput="{{taxRateCustomRateUS.code}}" stepKey="fillTaxIdentifierField3"/>
5151
<click selector="{{AdminTaxRateGridSection.search}}" stepKey="clickSearch2"/>
5252
<click selector="{{AdminTaxRateGridSection.nthRow('1')}}" stepKey="clickFirstRow2"/>
5353
<!-- Verify we see updated values on the tax rate form page -->
54-
<seeInField selector="{{AdminTaxRateFormSection.taxIdentifier}}" userInput="{{SimpleTaxRate.code}}" stepKey="seeRTaxIdentifier"/>
55-
<seeOptionIsSelected selector="{{AdminTaxRateFormSection.country}}" userInput="United States" stepKey="seeCountry2"/>
56-
<seeOptionIsSelected selector="{{AdminTaxRateFormSection.state}}" userInput="California" stepKey="seeState2"/>
57-
<seeInField selector="{{AdminTaxRateFormSection.zipCode}}" userInput="90001" stepKey="seeZipCode"/>
58-
<seeInField selector="{{AdminTaxRateFormSection.rate}}" userInput="100" stepKey="seeRate2"/>
54+
<seeInField selector="{{AdminTaxRateFormSection.taxIdentifier}}" userInput="{{taxRateCustomRateUS.code}}" stepKey="seeRTaxIdentifier"/>
55+
<seeOptionIsSelected selector="{{AdminTaxRateFormSection.country}}" userInput="{{taxRateCustomRateUS.tax_country}}" stepKey="seeCountry2"/>
56+
<seeOptionIsSelected selector="{{AdminTaxRateFormSection.state}}" userInput="{{taxRateCustomRateUS.tax_region}}" stepKey="seeState2"/>
57+
<seeInField selector="{{AdminTaxRateFormSection.zipCode}}" userInput="{{taxRateCustomRateUS.tax_postcode}}" stepKey="seeZipCode"/>
58+
<seeInField selector="{{AdminTaxRateFormSection.rate}}" userInput="{{taxRateCustomRateUS.rate}}" stepKey="seeRate2"/>
5959
</test>
6060
</tests>

0 commit comments

Comments
 (0)