Merge remote-tracking branch 'origin/MC-5801' into mtf-eol

Author: tomreece

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

@@ -16,5 +16,6 @@
         <element name="filterByCountry" type="input" selector="#tax_rate_grid_filter_tax_country_id"/>
         <element name="filterByPostCode" type="input" selector="#tax_rate_grid_filter_tax_postcode"/>
         <element name="nthRow" type="block" selector="tr[data-role='row']:nth-of-type({{var}})" parameterized="true" timeout="30"/>
+        <element name="emptyText" type="text" selector=".empty-text"/>
     </section>
 </sections>

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

@@ -10,5 +10,7 @@
           xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminTaxRuleFormSection">
         <element name="taxIdentifier" type="input" selector="input.admin__control-text admin__action-multiselect-search"/>
+        <element name="taxRateSearch" type="input" selector="input[data-role='advanced-select-text']"/>
+        <element name="fieldTaxRate" type="block" selector="div.field-tax_rate"/>
     </section>
 </sections>

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

@@ -10,6 +10,8 @@
           xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminTaxRuleGridSection">
         <element name="add" type="button" selector="#add" timeout="30"/>
+        <element name="search" type="button" selector="button[data-action='grid-filter-apply']" timeout="30"/>
+        <element name="filterByTaxIdentifier" type="text" selector="#taxRuleGrid_filter_code"/>
     </section>
 </sections>
 

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

@@ -0,0 +1,55 @@
+<?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="DeleteTaxRateEntityTest">
+        <annotations>
+            <stories value="Delete Tax Rate"/>
+            <title value="Delete tax rate"/>
+            <description value="Test log in to Tax Rate and Delete Tax Rate"/>
+            <testCaseId value="MC-5801"/>
+            <severity value="CRITICAL"/>
+            <group value="tax"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <createData entity="defaultTaxRate" stepKey="initialTaxRate"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+
+        <!-- Search the tax rate on tax grid page -->
+        <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRateIndex1"/>
+        <waitForPageLoad stepKey="waitForTaxRateIndex1"/>
+        <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters1"/>
+        <fillField selector="{{AdminTaxRateGridSection.filterByTaxIdentifier}}" userInput="$$initialTaxRate.code$$" stepKey="fillCode"/>
+        <click selector="{{AdminTaxRateGridSection.search}}" stepKey="clickSearch1"/>
+        <click selector="{{AdminTaxRateGridSection.nthRow('1')}}" stepKey="clickFirstRow1"/>
+
+        <!-- Delete values on the tax rate form page -->
+        <click selector="{{AdminTaxRateFormSection.deleteRate}}" stepKey="clickDeleteRate"/>
+        <click selector="{{AdminTaxRateFormSection.ok}}" stepKey="clickOk"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="You Deleted the tax rate." stepKey="seeSuccess1"/>
+
+        <!-- Confirm Deleted TaxIdentifier(from the above step) on the tax rate grid page -->
+        <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRateIndex2"/>
+        <waitForPageLoad stepKey="waitForTaxRateIndex2"/>
+        <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters2"/>
+        <fillField selector="{{AdminTaxRateGridSection.filterByTaxIdentifier}}" userInput="{{defaultTaxRate.code}}" stepKey="fillTaxIdentifierField3"/>
+        <click selector="{{AdminTaxRateGridSection.search}}" stepKey="clickSearch2"/>
+        <see selector="{{AdminTaxRateGridSection.emptyText}}" userInput="We couldn't find any records." stepKey="seeSuccess"/>
+
+        <!-- Confirm Deleted TaxIdentifier on the tax rule grid page -->
+        <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRuleIndex3"/>
+        <click selector="{{AdminTaxRuleGridSection.add}}" stepKey="clickAddNewTaxRuleButton"/>
+        <waitForPageLoad stepKey="waitForTaxRuleIndex1"/>
+        <fillField selector="{{AdminTaxRuleFormSection.taxRateSearch}}" userInput="$$initialTaxRate.code$$" stepKey="fillTaxRateSearch"/>
+        <wait stepKey="waitForSearch" time="5" />
+        <dontSee selector="{{AdminTaxRuleFormSection.fieldTaxRate}}" userInput="$$initialTaxRate.code$$" stepKey="dontSeeInTaxRuleForm"/>
+    </test>
+</tests>