Merge remote-tracking branch 'origin/AC-3201' into Hammer_Community_Backlog_06092022

Author: glo71317

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

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="ZeroTaxSubtotalActionGroup">
+        <annotations>
+            <description>Zero tax subtotal should not be displayed on frontend after admin config setting</description>
+        </annotations>
+        <arguments>
+            <argument name="optionValue" type="string" defaultValue="{{DefaultTotalFlagZero.value}}"/>
+        </arguments>
+        <amOnPage url="{{AdminTaxConfigurationPage.url}}" stepKey="navigateToAdminStoreTaxConfiguration"/>
+        <scrollTo selector="{{AdminZeroTaxFormSection.label}}" stepKey="scrollToDropdownSelection" />
+        <selectOption selector="{{AdminZeroTaxFormSection.optionvalue}}" userInput="{{optionValue}}" stepKey="setSelectorValue"/>
+        <click selector="{{AdminZeroTaxFormSection.saveConfig}}" stepKey="clickSave"/>
+    </actionGroup>
+</actionGroups>

app/code/Magento/Tax/Test/Mftf/Section/AdminZeroTaxFormSection.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminZeroTaxFormSection">
+        <element name="optionvalue" type="select" selector="select#tax_cart_display_zero_tax"/>
+        <element name="saveConfig" type="button" selector="#save" timeout="30"/>
+        <element name="label" type="input" selector="#row_tax_cart_display_zero_tax"/>
+    </section>
+</sections>

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

@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StoreFrontZeroTaxSettingCheckOnCartPage">
+        <annotations>
+            <stories value="Storefront cart page"/>
+            <title value="Zero tax configuration for multiple shipping methods on Cart page"/>
+            <description value="Zero tax configuration for multiple shipping methods on Cart page"/>
+            <severity value="MINOR"/>
+            <testCaseId value="AC-3201"/>
+            <group value="Tax"/>
+        </annotations>
+        <before>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
+            <actionGroup ref="ZeroTaxSubtotalActionGroup" stepKey="zerosubtotal"/>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="SimpleProduct" stepKey="createProduct01">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+        </before>
+        <after>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createProduct01" stepKey="deleteProduct1"/>
+        </after>
+
+        <amOnPage url="$$createProduct01.custom_attributes[url_key]$$.html" stepKey="goToSimpleProductPage"/>
+        <waitForPageLoad stepKey="waitForSimpleProductPage"/>
+        <waitForElementClickable selector="{{StorefrontProductActionSection.addToCart}}" stepKey="waitForAddToCartButton"/>
+        <click stepKey="addSimpleProductToCart" selector="{{StorefrontProductActionSection.addToCart}}"/>
+        <waitForPageLoad stepKey="waitForProductAdded"/>
+        <see stepKey="seeSuccess" selector="{{StorefrontMessagesSection.success}}" userInput="You added"/>
+        <actionGroup ref="StorefrontCartPageOpenActionGroup" stepKey="goToCartPage" />
+        <dontSeeElement selector="//*[@id='cart-totals']/div/table/tbody/tr[2]/th[contains(text(),'Tax')]" stepKey="checkZerotaxVisible"/>
+    </test>
+</tests>

app/code/Magento/Tax/view/frontend/web/js/view/checkout/cart/totals/tax.js

@@ -21,7 +21,7 @@ define([
          * @override
          */
         ifShowValue: function () {
-            if (this.getPureValue() === 0) {
+            if (parseInt(this.getPureValue()) === 0) { //eslint-disable-line radix
                 return isZeroTaxDisplayed;
             }