Skip to content

Commit 675f09f

Browse files
nikhilsharma-adobenikhilsharma-adobe
committed
Merge branch 'ACQE-4427_1' into ACQE-6354_mainline_PR_deployment
2 parents e521eff + 97e4a76 commit 675f09f

22 files changed

+776
-2
lines changed

‎app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeData.xml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -465,5 +465,15 @@
465465
<data key="frontend_input">price</data>
466466
<data key="used_for_sort_by">false</data>
467467
</entity>
468+
<entity name="productAttributeFPT" type="ProductAttribute">
469+
<data key="default_frontend_label">FPT</data>
470+
<data key="attribute_code">fpt</data>
471+
<data key="frontend_input">weee</data>
472+
<data key="scope">global</data>
473+
<data key="is_used_in_grid">true</data>
474+
<data key="is_visible_in_grid">true</data>
475+
<data key="is_filterable_in_grid">true</data>
476+
<requiredEntity type="FrontendLabel">ProductAttributeFrontendLabel</requiredEntity>
477+
</entity>
468478
</entities>
469479

‎app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminAssertTotalsWithTaxOnCreditMemoViewPageActionGroup.xml

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
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="AdminAssertTotalsWithTaxOnCreditMemoViewPageActionGroup">
12+
<annotations>
13+
<description>Asserts Totals on the Credit Memo page</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="subtotalExclTax" type="string"/>
17+
<argument name="subtotalInclTax" type="string"/>
18+
<argument name="discount" type="string"/>
19+
<argument name="fpt" type="string"/>
20+
<argument name="grandTotalExclTax" type="string"/>
21+
<argument name="grandTotalInclTax" type="string"/>
22+
<argument name="totalTaxWithTaxRate" type="string"/>
23+
</arguments>
24+
<scrollTo selector="{{AdminOrderTotalSection.subTotal}}" stepKey="scrollToOrderTotalSection"/>
25+
<waitForText selector="{{AdminOrderTotalSection.subTotal}}" userInput="{{subtotalExclTax}}" stepKey="checkSubtotalExclTax"/>
26+
<waitForText selector="{{AdminOrderTotalSection.fieldsInOrderTotals('Subtotal (Incl.Tax)')}}" userInput="{{subtotalInclTax}}" stepKey="checkPriceForSubtotalInclTax"/>
27+
<waitForText selector="{{AdminOrderTotalSection.fieldsInOrderTotals('Discount (Sales Rule Description)')}}" userInput="{{discount}}" stepKey="checkPriceForDiscount"/>
28+
<waitForText selector="{{AdminOrderTotalSection.fpt}}" userInput="{{fpt}}" stepKey="checkPriceForFPT"/>
29+
<waitForText selector="{{AdminOrderTotalSection.fieldsInOrderTotals('Grand Total (Excl.Tax)')}}" userInput="{{grandTotalExclTax}}" stepKey="checkPriceForGrandTotalExclTax"/>
30+
<waitForText selector="{{AdminOrderTotalSection.fieldsInOrderTotals('Grand Total (Incl.Tax)')}}" userInput="{{grandTotalInclTax}}" stepKey="checkPriceForGrandTotalInclTax"/>
31+
<waitForElementClickable selector="{{AdminOrderTotalSection.totalTaxDropdown}}" stepKey="waitForTotalTaxDropdownToClickable"/>
32+
<click selector="{{AdminOrderTotalSection.totalTaxDropdown}}" stepKey="clickTotalTaxDropdown"/>
33+
<waitForText selector="{{AdminOrderTotalSection.totalTaxWithTaxRate}}" userInput="{{totalTaxWithTaxRate}}" stepKey="checkPriceForTotalTaxWithTaxRate"/>
34+
</actionGroup>
35+
</actionGroups>

‎app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminAssertTotalsWithTaxOnInvoiceTotalsExcludingShippingAndHandlingPricesPageActionGroup.xml

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
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="AdminAssertTotalsWithTaxOnInvoiceTotalsExcludingShippingAndHandlingPricesPageActionGroup">
12+
<annotations>
13+
<description>Asserts Totals on the Invoice page</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="subtotalExclTax" type="string"/>
17+
<argument name="subtotalInclTax" type="string"/>
18+
<argument name="discount" type="string"/>
19+
<argument name="fpt" type="string"/>
20+
<argument name="grandTotalExclTax" type="string"/>
21+
<argument name="grandTotalInclTax" type="string"/>
22+
<argument name="totalTaxWithTaxRate" type="string"/>
23+
</arguments>
24+
<scrollTo selector="{{AdminOrderTotalSection.subTotal}}" stepKey="scrollToOrderTotalSection"/>
25+
<waitForText selector="{{AdminOrderTotalSection.subTotal}}" userInput="{{subtotalExclTax}}" stepKey="checkSubtotalExclTax"/>
26+
<waitForText selector="{{AdminOrderTotalSection.fieldsInOrderTotals('Subtotal (Incl.Tax)')}}" userInput="{{subtotalInclTax}}" stepKey="checkPriceForSubtotalInclTax"/>
27+
<waitForText selector="{{AdminOrderTotalSection.fieldsInOrderTotals('Discount (Sales Rule Description)')}}" userInput="{{discount}}" stepKey="checkPriceForDiscount"/>
28+
<waitForText selector="{{AdminOrderTotalSection.fpt}}" userInput="{{fpt}}" stepKey="checkPriceForFPT"/>
29+
<waitForText selector="{{AdminOrderTotalSection.fieldsInOrderTotals('Grand Total (Excl.Tax)')}}" userInput="{{grandTotalExclTax}}" stepKey="checkPriceForGrandTotalExclTax"/>
30+
<waitForText selector="{{AdminOrderTotalSection.fieldsInOrderTotals('Grand Total (Incl.Tax)')}}" userInput="{{grandTotalInclTax}}" stepKey="checkPriceForGrandTotalInclTax"/>
31+
<waitForElementClickable selector="{{AdminOrderTotalSection.totalTaxDropdown}}" stepKey="waitForTotalTaxDropdownToClickable"/>
32+
<click selector="{{AdminOrderTotalSection.totalTaxDropdown}}" stepKey="clickTotalTaxDropdown"/>
33+
<waitForText selector="{{AdminOrderTotalSection.totalTaxWithTaxRate}}" userInput="{{totalTaxWithTaxRate}}" stepKey="checkPriceForTotalTaxWithTaxRate"/>
34+
</actionGroup>
35+
</actionGroups>

‎app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminAssertTotalsWithTaxOnOrderViewPageActionGroup.xml

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
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="AdminAssertTotalsWithTaxOnOrderViewPageActionGroup">
12+
<annotations>
13+
<description>Asserts Totals on the Order View page</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="subtotalExclTax" type="string"/>
17+
<argument name="subtotalInclTax" type="string"/>
18+
<argument name="discount" type="string"/>
19+
<argument name="shippingAndHandlingExclTax" type="string"/>
20+
<argument name="shippingAndHandlingInclTax" type="string"/>
21+
<argument name="fpt" type="string"/>
22+
<argument name="grandTotalExclTax" type="string"/>
23+
<argument name="grandTotalInclTax" type="string"/>
24+
<argument name="totalTaxWithTaxRate" type="string"/>
25+
</arguments>
26+
<scrollTo selector="{{AdminOrderTotalSection.subTotal}}" stepKey="scrollToOrderTotalSection"/>
27+
<waitForText selector="{{AdminOrderTotalSection.subTotal}}" userInput="{{subtotalExclTax}}" stepKey="checkSubtotalExclTax"/>
28+
<waitForText selector="{{AdminOrderTotalSection.fieldsInOrderTotals('Subtotal (Incl.Tax)')}}" userInput="{{subtotalInclTax}}" stepKey="checkPriceForSubtotalInclTax"/>
29+
<waitForText selector="{{AdminOrderTotalSection.fieldsInOrderTotals('Discount (Sales Rule Description)')}}" userInput="{{discount}}" stepKey="checkPriceForDiscount"/>
30+
<waitForText selector="{{AdminOrderTotalSection.fieldsInOrderTotals('Shipping &amp; Handling (Excl.Tax)')}}" userInput="{{shippingAndHandlingExclTax}}" stepKey="checkPriceForShippingAndHandlingExclTax"/>
31+
<waitForText selector="{{AdminOrderTotalSection.fieldsInOrderTotals('Shipping &amp; Handling (Incl.Tax)')}}" userInput="{{shippingAndHandlingInclTax}}" stepKey="checkPriceForShippingAndHandlingInclTax"/>
32+
<waitForText selector="{{AdminOrderTotalSection.fpt}}" userInput="{{fpt}}" stepKey="checkPriceForFPT"/>
33+
<waitForText selector="{{AdminOrderTotalSection.fieldsInOrderTotals('Grand Total (Excl.Tax)')}}" userInput="{{grandTotalExclTax}}" stepKey="checkPriceForGrandTotalExclTax"/>
34+
<waitForText selector="{{AdminOrderTotalSection.fieldsInOrderTotals('Grand Total (Incl.Tax)')}}" userInput="{{grandTotalInclTax}}" stepKey="checkPriceForGrandTotalInclTax"/>
35+
<waitForElementClickable selector="{{AdminOrderTotalSection.totalTaxDropdown}}" stepKey="waitForTotalTaxDropdownToClickable"/>
36+
<click selector="{{AdminOrderTotalSection.totalTaxDropdown}}" stepKey="clickTotalTaxDropdown"/>
37+
<waitForText selector="{{AdminOrderTotalSection.totalTaxWithTaxRate}}" userInput="{{totalTaxWithTaxRate}}" stepKey="checkPriceForTotalTaxWithTaxRate"/>
38+
</actionGroup>
39+
</actionGroups>

‎app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminCreateCreditMemoWithUpdateQtyActionGroup.xml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
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" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="AdminCreateCreditMemoWithUpdateQtyActionGroup">
11+
<annotations>
12+
<description>Admin starts creating credit memo with 'Update Qty'.</description>
13+
</annotations>
14+
<arguments>
15+
<argument name="productQty" type="string" defaultValue="{{minimalProductQty.value}}"/>
16+
</arguments>
17+
<waitForElementClickable selector="{{AdminOrderDetailsMainActionsSection.creditMemo}}" stepKey="waitToClickCreditMemo"/>
18+
<click selector="{{AdminOrderDetailsMainActionsSection.creditMemo}}" stepKey="clickCreditMemo"/>
19+
<waitForElementVisible selector="{{AdminCreditMemoItemsSection.itemQtyToRefund('1')}}" stepKey="waitToItemToRefundTextField"/>
20+
<fillField selector="{{AdminCreditMemoItemsSection.itemQtyToRefund('1')}}" userInput="{{productQty}}" stepKey="partialRefund"/>
21+
<waitForElementClickable selector="{{AdminCreditMemoItemsSection.updateQty}}" stepKey="waitToClickUpdateQuantity"/>
22+
<click selector="{{AdminCreditMemoItemsSection.updateQty}}" stepKey="updateQuantityToRefund"/>
23+
<waitForPageLoad stepKey="waitForQuantityApplied"/>
24+
</actionGroup>
25+
</actionGroups>

‎app/code/Magento/Sales/Test/Mftf/Section/AdminOrderTotalSection.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,8 @@
2828
<element name="negotiatedDiscount" type="text" selector="//tbody//tr[@class='col-negotiated_discount']//span[@class='price' and contains(text(),'{{value}}')]" parameterized="true"/>
2929
<element name="subTotalInclTax" type="text" selector="//tbody//tr[@class='col-subtotal_incl']//span[@class='price' and contains(text(),'{{value}}')]" parameterized="true"/>
3030
<element name="subTotalExclTax" type="text" selector="//tbody//tr[@class='col-subtotal_excl']//span[@class='price' and contains(text(),'{{value}}')]" parameterized="true"/>
31+
<element name="fieldsInOrderTotals" type="text" selector="//table[contains(@class, 'order-subtotal-table')]//td[normalize-space(.)='{{fieldsInOrderTotals}}']/following-sibling::td//span[@class='price']" parameterized="true"/>
32+
<element name="totalTaxWithTaxRate" type="text" selector="//table[contains(@class, 'order-subtotal-table')]//td[normalize-space(.)='Total Tax']/parent::tr/following-sibling::tr//span[@class='price']"/>
33+
<element name="totalTaxDropdown" type="text" selector="//table[contains(@class, 'order-subtotal-table')]//td[normalize-space(.)='Total Tax']"/>
3134
</section>
3235
</sections>

‎app/code/Magento/SalesRule/Test/Mftf/Data/SalesRuleData.xml

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -639,4 +639,34 @@
639639
<data key="sort_order">3</data>
640640
<data key="stop_rules_processing">true</data>
641641
</entity>
642-
</entities>
642+
<entity name="SalesRuleSpecificCouponAndBy50Percent" type="SalesRule">
643+
<data key="name" unique="suffix">SalesRule</data>
644+
<data key="description">Sales Rule Description</data>
645+
<array key="website_ids">
646+
<item>1</item>
647+
</array>
648+
<array key="customer_group_ids">
649+
<item>0</item>
650+
<item>1</item>
651+
<item>2</item>
652+
<item>3</item>
653+
</array>
654+
<data key="uses_per_customer">1</data>
655+
<data key="is_active">true</data>
656+
<data key="stop_rules_processing">true</data>
657+
<data key="is_advanced">true</data>
658+
<data key="sort_order">2</data>
659+
<data key="simple_action">by_percent</data>
660+
<data key="discount_amount">50</data>
661+
<data key="maximumQtyDiscount">0</data>
662+
<data key="discount_qty">0</data>
663+
<data key="discount_step">0</data>
664+
<data key="apply_to_shipping">false</data>
665+
<data key="times_used">1</data>
666+
<data key="is_rss">false</data>
667+
<data key="coupon_type">SPECIFIC_COUPON</data>
668+
<data key="use_auto_generation">false</data>
669+
<data key="uses_per_coupon">2</data>
670+
<data key="simple_free_shipping">0</data>
671+
</entity>
672+
</entities>

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

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="AdminChangeCalculationSettingsActionGroup">
12+
<annotations>
13+
<description>Goes to the 'Configuration' page for 'Tax'. Change the 'Calculation Settings'.</description>
14+
</annotations>
15+
<!-- change configurations on tax calculation settings-->
16+
<conditionalClick selector="{{AdminConfigureTaxSection.taxCalculationSettings}}" dependentSelector="{{AdminConfigureTaxSection.taxCalculationSettings}}" visible="true" stepKey="openCalculationSettingsTab"/>
17+
<conditionalClick selector="{{AdminConfigureTaxSection.taxCalculationAlgorithmInherit}}" dependentSelector="{{AdminConfigureTaxSection.taxCalculationAlgorithmInherit}}" visible="true" stepKey="clickCalculationMethodBasedCheckBox"/>
18+
<selectOption userInput="Total" selector="{{AdminConfigureTaxSection.taxCalculationAlgorithm}}" stepKey="fillCalculationMethodBased"/>
19+
<conditionalClick selector="{{AdminConfigureTaxSection.taxCalculationBasedInherit}}" dependentSelector="{{AdminConfigureTaxSection.taxCalculationBasedInherit}}" visible="true" stepKey="clickTaxCalculationBasedCheckBox"/>
20+
<selectOption userInput="Shipping Origin" selector="{{AdminConfigureTaxSection.taxCalculationBased}}" stepKey="fillTaxCalculationBased"/>
21+
<conditionalClick selector="{{AdminConfigureTaxSection.taxCalculationPricesInherit}}" dependentSelector="{{AdminConfigureTaxSection.taxCalculationPricesInherit}}" visible="true" stepKey="clickCalculationPricesCheckBox"/>
22+
<selectOption userInput="Including Tax" selector="{{AdminConfigureTaxSection.taxCalculationPrices}}" stepKey="setCalculationPriceToIncludingTax"/>
23+
<conditionalClick selector="{{AdminConfigureTaxSection.taxCalculationShippingPricesInherit}}" dependentSelector="{{AdminConfigureTaxSection.taxCalculationShippingPricesInherit}}" visible="true" stepKey="clickShippingPricesCheckBox"/>
24+
<selectOption userInput="Excluding Tax" selector="{{AdminConfigureTaxSection.taxCalculationShippingPrices}}" stepKey="setCalculationPriceToExcludingTax"/>
25+
<conditionalClick selector="{{AdminConfigureTaxSection.taxCalculationApplyCustomerTaxInherit}}" dependentSelector="{{AdminConfigureTaxSection.taxCalculationShippingPricesInherit}}" visible="true" stepKey="clickApplyCustomerTaxCheckBox"/>
26+
<selectOption userInput="After Discount" selector="{{AdminConfigureTaxSection.taxCalculationApplyCustomerTax}}" stepKey="setApplyCustomerTaxAfterDiscount"/>
27+
<conditionalClick selector="{{AdminConfigureTaxSection.taxCalculationApplyDiscountOnPricesInherit}}" dependentSelector="{{AdminConfigureTaxSection.taxCalculationShippingPricesInherit}}" visible="true" stepKey="clickApplyDiscountOnPricesCheckBox"/>
28+
<selectOption userInput="Excluding Tax" selector="{{AdminConfigureTaxSection.taxCalculationApplyDiscountOnPrices}}" stepKey="setApplyDiscountOnPricesToExecludeTax"/>
29+
</actionGroup>
30+
</actionGroups>

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

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
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="AdminChangeDefaultTaxClassForProductActionGroup">
12+
<annotations>
13+
<description>Goes to the 'Configuration' page for 'Tax'. Sets the 'Default Tax Class for Product' configuration setting to 'Taxable Goods'.</description>
14+
</annotations>
15+
<waitForElementClickable selector="{{AdminConfigureTaxSection.useSystemValue}}" stepKey="waitForClickSystemValue"/>
16+
<click selector="{{AdminConfigureTaxSection.useSystemValue}}" stepKey="checkSystemValue"/>
17+
<selectOption selector="{{AdminConfigureTaxSection.taxClassProduct}}" userInput="Taxable Goods" stepKey="setTaxClassForShipping"/>
18+
</actionGroup>
19+
</actionGroups>

0 commit comments

Comments
 (0)