Skip to content

Commit 5fbd056

Browse files
akaashakaash
akaash
authored and
akaash
committed
Merge branch 'ACQE-5445' into functional-mainline-pr-ce-new
2 parents c9124f5 + ed685ed commit 5fbd056

File tree

4 files changed

+94
-0
lines changed

4 files changed

+94
-0
lines changed

‎app/code/Magento/Config/Test/Mftf/ActionGroup/AdminSetTaxClassForShippingActionGroup.xml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
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="AdminSetTaxClassForShippingActionGroup" extends="SetTaxClassForShippingActionGroup">
12+
<annotations>
13+
<description>Extends to select required shipping tax class</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="taxClass" type="string" defaultValue="Taxable Goods"/>
17+
</arguments>
18+
19+
<remove keyForRemoval="selectOption"/>
20+
<selectOption selector="{{SalesConfigSection.ShippingTaxClass}}" userInput="{{taxClass}}" after="uncheckUseSystemValue" stepKey="setShippingTaxClass"/>
21+
</actionGroup>
22+
</actionGroups>

‎app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminOpenTaxRuleActionGroup.xml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
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="AdminOpenTaxRuleActionGroup">
12+
<annotations>
13+
<description>Admin Open tax rule page</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="code" type="string" defaultValue="{{SimpleTaxRule.code}}"/>
17+
</arguments>
18+
19+
<amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRuleGridPage"/>
20+
<waitForPageLoad stepKey="waitForTaxGridPage"/>
21+
<conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
22+
<waitForPageLoad stepKey="waitForPageLoadedToClearFilters"/>
23+
<waitForElementVisible selector="{{AdminTaxRuleGridSection.code}}" stepKey="waitForTaxIdentifierFieldToVisible"/>
24+
<fillField selector="{{AdminTaxRuleGridSection.code}}" userInput="{{code}}" stepKey="fillTaxRuleCode"/>
25+
<waitForElementClickable selector="{{AdminTaxRuleGridSection.search}}" stepKey="waitForSearchButtonToBeClickable"/>
26+
<click selector="{{AdminTaxRuleGridSection.search}}" stepKey="clickSearch"/>
27+
<waitForPageLoad stepKey="waitForTaxRuleSearch"/>
28+
<waitForElementClickable selector="{{AdminTaxRuleGridSection.nthRow('1')}}" stepKey="waitForRowToBeClickable"/>
29+
<click selector="{{AdminTaxRuleGridSection.nthRow('1')}}" stepKey="clickFirstRow"/>
30+
<waitForPageLoad stepKey="waitForTaxRulePageToOpen"/>
31+
</actionGroup>
32+
</actionGroups>

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,8 @@
2626
<data key="class_name">Taxable Goods</data>
2727
<data key="class_type">PRODUCT</data>
2828
</entity>
29+
<entity name="shippingTaxClass" type="taxClass">
30+
<data key="class_name">Shipping Tax Class </data>
31+
<data key="class_type">PRODUCT</data>
32+
</entity>
2933
</entities>

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

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,4 +159,40 @@
159159
<data key="tax_postcode">*</data>
160160
<data key="rate">8.2500</data>
161161
</entity>
162+
<entity name="Product_Rate_CA" type="taxRate">
163+
<data key="code">Product Rate CA</data>
164+
<data key="tax_region">CA</data>
165+
<data key="tax_region_id">12</data>
166+
<data key="tax_country_id">US</data>
167+
<data key="tax_country">United States</data>
168+
<data key="tax_postcode">*</data>
169+
<data key="rate">10.0000</data>
170+
</entity>
171+
<entity name="Product_Rate_NY" type="taxRate">
172+
<data key="code">Product Rate NY</data>
173+
<data key="tax_region">NY</data>
174+
<data key="tax_region_id">43</data>
175+
<data key="tax_country_id">US</data>
176+
<data key="tax_country">United States</data>
177+
<data key="tax_postcode">*</data>
178+
<data key="rate">7.0000</data>
179+
</entity>
180+
<entity name="Shipping_Rate_NY" type="taxRate">
181+
<data key="code">Shipping Rate NY</data>
182+
<data key="tax_region">NY</data>
183+
<data key="tax_region_id">43</data>
184+
<data key="tax_country_id">US</data>
185+
<data key="tax_country">United States</data>
186+
<data key="tax_postcode">*</data>
187+
<data key="rate">3.0000</data>
188+
</entity>
189+
<entity name="Shipping_Rate_CA" type="taxRate">
190+
<data key="code">Shipping Rate CA</data>
191+
<data key="tax_region">CA</data>
192+
<data key="tax_region_id">12</data>
193+
<data key="tax_country_id">US</data>
194+
<data key="tax_country">United States</data>
195+
<data key="tax_postcode">*</data>
196+
<data key="rate">5.0000</data>
197+
</entity>
162198
</entities>

0 commit comments

Comments
 (0)