Skip to content

Commit e624c71

Browse files
MAGETWO-91521: Reports / Sales / Tax report show incorrect amount
- Update automated test based on comments
1 parent bfbb981 commit e624c71

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminTaxActionGroup.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
-->
88

99
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10-
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
1111
<!-- Change the tax configuration to display in cart and checkout flow -->
1212
<actionGroup name="editTaxConfigurationByUI">
1313
<!-- navigate to the tax configuration page -->
@@ -130,12 +130,13 @@
130130
<argument name="taxClassName" type="string"/>
131131
</arguments>
132132
<!-- Go to tax rule page -->
133-
<amOnPage url="/admin/tax/rule/new" stepKey="goToNewTaxRulePage"/>
133+
<amOnPage url="{{AdminNewTaxRulePage.url}}" stepKey="goToNewTaxRulePage"/>
134134
<waitForPageLoad stepKey="waitForTaxRatePage"/>
135135
<click stepKey="clickAdditionalSettings" selector="{{AdminTaxRulesSection.additionalSettings}}"/>
136136
<scrollTo stepKey="scrollToAdditionalSettings" selector="{{AdminTaxRulesSection.additionalSettings}}"/>
137137
<moveMouseOver stepKey="hoverDeleteElement" selector="{{AdminTaxRulesSection.deleteTaxClassName(taxClassName)}}"/>
138138
<click stepKey="deleteFirstTaxClass" selector="{{AdminTaxRulesSection.deleteTaxClass(taxClassName)}}"/>
139+
<waitForElementVisible selector="{{AdminTaxRulesSection.popUpDialogOK}}" stepKey="waitForElementBecomeVisible"/>
139140
<click stepKey="acceptPopUpDialog" selector="{{AdminTaxRulesSection.popUpDialogOK}}"/>
140141
<waitForPageLoad stepKey="waitForProductTaxClassDeleted"/>
141142
</actionGroup>

app/code/Magento/Tax/Test/Mftf/Data/TaxCodeData.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
-->
88

99
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10-
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
1111
<entity name="SimpleTaxNY" type="tax">
1212
<data key="state">New York</data>
1313
<data key="country">United States</data>
@@ -29,13 +29,13 @@
2929
<entity name="SimpleTaxWithZipCode" type="tax">
3030
<data key="state">California</data>
3131
<data key="country">United States</data>
32-
<data key="zip">35005</data>
32+
<data key="zip">78729</data>
3333
<data key="rate">7.25</data>
3434
</entity>
3535
<entity name="SimpleSecondTaxWithZipCode" type="tax">
3636
<data key="state">California</data>
3737
<data key="country">United States</data>
38-
<data key="zip">35005</data>
38+
<data key="zip">78729</data>
3939
<data key="rate">0.125</data>
4040
</entity>
4141
</entities>

app/code/Magento/Tax/Test/Mftf/Test/AdminTaxReportGridTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
-->
88

99
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10-
xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
1111
<test name="AdminTaxReportGridTest">
1212
<annotations>
1313
<features value="Tax"/>

0 commit comments

Comments
 (0)