Merge branch '2.4-develop' into commpr-10131-2907

del10131 · web-flow · commit d70b8c0f0d36 · 2025-08-01T10:33:42.000+05:30
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/EditOrderWithBundleProductBackendTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/EditOrderWithBundleProductBackendTest.xml
@@ -155,6 +155,7 @@
         <wait time="2" stepKey="waitForPageLoad2" />
         <click selector="{{AdminOrderDetailsMainActionsSection.edit}}" stepKey="clickEditButton"/>
         <click selector="{{AdminOrderDetailsMainActionsSection.ok}}" stepKey="clickOk"/>
+        <waitForElementClickable selector="{{AdminOrderFormItemsSection.configure}}" stepKey="waitForItemConfigureButton"/>
         <click selector="{{AdminOrderFormItemsSection.configure}}" stepKey="clickConfigure"/>
         <click selector="{{AdminOrderFormConfigureProductSection.selectOption}}" stepKey="clickTodropdown2"/>
         <click selector="{{AdminOrderFormConfigureProductSection.selectProductOption('3')}}" stepKey="clickToSelectOption2"/>
diff --git a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/AssertStorefrontOrderDetailsOnPayPalPageActionGroup.xml b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/AssertStorefrontOrderDetailsOnPayPalPageActionGroup.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
+  * Copyright 2024 Adobe
+  * All Rights Reserved.
   */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -17,13 +17,11 @@
             <argument name="totalAmount" type="string" defaultValue="$15.00"/>
             <argument name="shippingAddress" type="string" defaultValue="4145 Madison Ave, Culver City, CA 90232"/>
         </arguments>
-        <waitForElementClickable selector="{{PayPalPaymentSection.orderTotalOnPaypalCheckout}}" stepKey="waitForAmountButtonToBeClickable"/>
-        <click selector="{{PayPalPaymentSection.orderTotalOnPaypalCheckout}}" stepKey="clickAmountToOpen"/>
+        <waitForElementClickable selector="{{PayPalPaymentSection.orderTotalTabOnPaypalCheckout}}" stepKey="waitForAmountButtonToBeClickable"/>
+        <click selector="{{PayPalPaymentSection.orderTotalTabOnPaypalCheckout}}" stepKey="clickAmountToOpen"/>
         <waitForElementVisible selector="{{PayPalPaymentSection.subtotal(subtotalAmount)}}" stepKey="assertSubtotal"/>
         <waitForElementVisible selector="{{PayPalPaymentSection.shipping(shippingAmount)}}" stepKey="assertShipping"/>
-        <waitForText selector="{{PayPalPaymentSection.total}}" userInput="{{totalAmount}}" stepKey="assertTotal"/>
-        <waitForElementClickable selector="{{PayPalPaymentSection.close}}" stepKey="waitForCLoseButtonToBeClickable"/>
-        <click selector="{{PayPalPaymentSection.close}}" stepKey="clickCloseButton"/>
+        <waitForElementVisible selector="{{PayPalPaymentSection.total(totalAmount)}}" stepKey="assertTotal"/>
         <waitForText selector="{{PayPalPaymentSection.shippingAddress}}" userInput="{{shippingAddress}}" stepKey="assertShippingAddress"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/SelectShippingAddressOnPayPalPaymentPageActionGroup.xml b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/SelectShippingAddressOnPayPalPaymentPageActionGroup.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
+  * Copyright 2024 Adobe
+  * All Rights Reserved.
   */
 -->
 
@@ -17,9 +17,8 @@
         </arguments>
         <waitForElementClickable selector="{{PayPalPaymentSection.changeShippingAddressButton}}" stepKey="waitForChangeShippingAddressButton"/>
         <click selector="{{PayPalPaymentSection.changeShippingAddressButton}}" stepKey="clickChangeShippingAddressButton"/>
-        <waitForElementVisible selector="{{PayPalPaymentSection.shippingAddressDropdown}}" stepKey="waitForAddressDropdown"/>
-        <selectOption selector ="{{PayPalPaymentSection.shippingAddressDropdown}}" userInput="{{address.shippingCustomerName}} - {{address.ShippingAddress}}" stepKey="selectShippingAddress"/>
-        <waitForElementVisible selector="{{PayPalPaymentSection.selectedShippingAddress(address.ShippingAddress)}}" stepKey="verifyAddressIsSelected"/>
+        <waitForElementClickable selector ="{{PayPalPaymentSection.shippingAddressDropdown(address.ShippingAddress)}}" stepKey="waitForAddressDropdown"/>
+        <executeJS function="document.evaluate(&quot;{{PayPalPaymentSection.shippingAddressDropdown(address.ShippingAddress)}}&quot;, document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue.click();" stepKey="selectShippingAddress"/>
     </actionGroup>
 </actionGroups>
 
diff --git a/app/code/Magento/Paypal/Test/Mftf/Data/PaypalAddressData.xml b/app/code/Magento/Paypal/Test/Mftf/Data/PaypalAddressData.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
+  * Copyright 2024 Adobe
+  * All Rights Reserved.
   */
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="ShippingAddressUS">
         <data key="shippingCustomerName">US cust1</data>
-        <data key="ShippingAddress">6161 West Centinela Avenue, Culver city, CA 90230</data>
+        <data key="ShippingAddress">6161 West Centinela Avenue, Culver City, CA 90230</data>
     </entity>
 </entities>
diff --git a/app/code/Magento/Paypal/Test/Mftf/Section/PayPalExpressCheckoutConfigSection/PayPalPaymentSection.xml b/app/code/Magento/Paypal/Test/Mftf/Section/PayPalExpressCheckoutConfigSection/PayPalPaymentSection.xml
@@ -26,15 +26,16 @@
         <element name="paypalCart" type="text" selector="#transactionCart"/>
         <element name="productNamePosition" type="text" selector=".itemName"/>
         <element name="orderTotalOnPaypalCheckout" type="text" selector="//button[(@id='one-time-cta' and @data-atomic-wait-domain='xo') or @data-testid='submit-button-initial' or @data-id='payment-submit-btn']//div[starts-with(normalize-space(text()), '$')]"/>
-        <element name="subtotal" type="text" selector="//div[@data-testid='line-item-subtotal']//span[contains(text(),'{{subtotal}}')]" parameterized="true"/>
-        <element name="shipping" type="text" selector="//div[@data-testid='line-item-shipping']//span[contains(text(),'{{shippingAmount}}')]" parameterized="true"/>
-        <element name="total" type="text" selector="//span[@data-testid='cart-sheet-total']"/>
-        <element name="shippingAddress" type="text" selector="//div[@data-testid='shipping-address']/p[@data-testid='ship-to-address']"/>
+        <element name="orderTotalTabOnPaypalCheckout" type="text" selector="//div[contains(@class, 'group/accordion-item')]//button[contains(@data-dd-action-name, 'Order Tab')]"/>
+        <element name="subtotal" type="text" selector="//span[text()='Subtotal']/following-sibling::span[contains(text(),'{{subtotal}}')]" parameterized="true"/>
+        <element name="shipping" type="text" selector="//span[text()='Shipping']/following-sibling::span[contains(text(),'{{shippingAmount}}')]" parameterized="true"/>
+        <element name="total" type="text" selector="//span[text()='Total']/following-sibling::span[contains(text(),'{{total}}')]" parameterized="true"/>
+        <element name="shippingAddress" type="text" selector="//button[@data-dd-action-name='Ship to Tab']//div[contains(@class, 'items-end')]//span[contains(@class, 'text-caption')]"/>
         <element name="close" type="button" selector="//button[@aria-label='Close']"/>
         <element name="paypalPopupButton1" type="button" selector="//button[span[text()='Pay with Debit or Credit Card']]"/>
         <element name="paypalPopupButton2" type="button" selector="//button[span[text()='Create an Account']]"/>
-        <element name="changeShippingAddressButton" type="button" selector="#change-shipping"/>
-        <element name="shippingAddressDropdown" type="select" selector="#shippingDropdown"/>
+        <element name="changeShippingAddressButton" type="button" selector="//button[@data-dd-action-name='Ship to Tab']"/>
+        <element name="shippingAddressDropdown" type="select" selector="(//div[@data-dd-action-name='Shipping Address'][.//span[contains(normalize-space(.), '{{ShippingAddress}}')]])[1]" parameterized="true"/>
         <element name="selectedShippingAddress" type="text" selector="//div/p[contains(text(), '{{selectedAddress}}')]" parameterized="true"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Paypal/Test/Mftf/Section/PayPalExpressCheckoutConfigSection/StorefrontPayPalPayLaterSection.xml b/app/code/Magento/Paypal/Test/Mftf/Section/PayPalExpressCheckoutConfigSection/StorefrontPayPalPayLaterSection.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
+  * Copyright 2024 Adobe
+  * All Rights Reserved.
   */
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="StorefrontPayPalPayLaterSection">
-        <element name="payPalPayLaterMessage" type="text" selector="//p[contains(@class,'PayLater')]/span[1]" />
+        <element name="payPalPayLaterMessage" type="text" selector="//button[@role='checkbox' and @data-dd-action-name='Pay in 4']//div[contains(@class, 'grid-area:description')]"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Paypal/Test/Mftf/Test/AdminRegisteredUserPayPalExpressCheckoutMethodAndFlatRateTest.xml b/app/code/Magento/Paypal/Test/Mftf/Test/AdminRegisteredUserPayPalExpressCheckoutMethodAndFlatRateTest.xml
@@ -70,8 +70,6 @@
         <actionGroup ref="SwitchToPayPalGroupBtnActionGroup" stepKey="clickPayPalBtn"/>
         <!--Login to Paypal in-context-->
         <actionGroup ref="StorefrontLoginToPayPalPaymentAccountTwoStepActionGroup" stepKey="LoginToPayPal"/>
-        <!--Verify Buyer shipping address -->
-        <waitForText selector="{{PayPalPaymentSection.shippingAddress}}" userInput="7700 West Parmer Lane, Austin, TX 78729" stepKey="assertShippingAddress"/>
         <actionGroup ref="StorefrontPaypalSwitchBackToMagentoFromCheckoutPageActionGroup" stepKey="confirmPaymentAndGoBackToMagento"/>
         <!-- See order successful Page instead of Order Review Page -->
         <waitForElement selector="{{CheckoutSuccessMainSection.successTitle}}" stepKey="waitForLoadSuccessPageTitle"/>
diff --git a/app/code/Magento/Paypal/Test/Mftf/Test/GuestCheckoutWithPayPalButtonFromCheckoutPageFreeShippingTest.xml b/app/code/Magento/Paypal/Test/Mftf/Test/GuestCheckoutWithPayPalButtonFromCheckoutPageFreeShippingTest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
+  * Copyright 2024 Adobe
+  * All Rights Reserved.
   */
 -->
 
@@ -33,6 +33,7 @@
             <!-- Enable Free Shipping method -->
             <createData entity="FreeShippinMethodConfig" stepKey="enableFreeShipping"/>
             <!-- Create Tax Rule w/ NY & CA Tax Rates -->
+            <actionGroup ref="AdminDeleteAllTaxRulesActionGroup" stepKey="deleteAllTaxRules"/>
             <actionGroup ref="AdminTaxRateGridOpenPageActionGroup" stepKey="goToTaxRatesPage"/>
             <actionGroup ref="AdminDeleteMultipleTaxRatesActionGroup" stepKey="deleteAllNonDefaultTaxRates"/>
             <actionGroup ref="AdminGoToNewTaxRulePageActionGroup" stepKey="goToCreateTaxRulePage"/>
diff --git a/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontProductPriceWithTaxDisplayedInPayPalPayLaterMessageTest.xml b/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontProductPriceWithTaxDisplayedInPayPalPayLaterMessageTest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
+  * Copyright 2024 Adobe
+  * All Rights Reserved.
   */
 -->
 
@@ -31,6 +31,7 @@
                 <argument name="countryCode" value="us"/>
             </actionGroup>
             <!-- Create Tax Rule w/ NY & CA Tax Rates -->
+            <actionGroup ref="AdminDeleteAllTaxRulesActionGroup" stepKey="deleteAllTaxRules"/>
             <actionGroup ref="AdminTaxRateGridOpenPageActionGroup" stepKey="goToTaxRatesPage"/>
             <actionGroup ref="AdminDeleteMultipleTaxRatesActionGroup" stepKey="deleteAllNonDefaultTaxRates"/>
             <actionGroup ref="AdminGoToNewTaxRulePageActionGroup" stepKey="goToCreateTaxRulePage"/>
@@ -55,6 +56,7 @@
                 <argument name="name" value="{{SimpleTaxRule.code}}"/>
                 <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
             </actionGroup>
+            <actionGroup ref="AdminDeleteAllTaxRulesActionGroup" stepKey="deleteAllTaxRules"/>
             <actionGroup ref="AdminTaxRateGridOpenPageActionGroup" stepKey="goToTaxRatesPage"/>
             <actionGroup ref="AdminDeleteMultipleTaxRatesActionGroup" stepKey="deleteAllNonDefaultTaxRates"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin"/>
@@ -77,7 +79,7 @@
         <!--Login to Paypal in-context-->
         <actionGroup ref="StorefrontLoginToPayPalPaymentAccountTwoStepActionGroup" stepKey="loginToPayPal"/>
         <!--Scroll down to paypal pay later option and verify message-->
-        <waitForText userInput="4 payments of $25.00 due every 2 weeks, starting today." selector="{{StorefrontPayPalPayLaterSection.payPalPayLaterMessage}}" stepKey="verifyPayPalPayLaterMessage1"/>
+        <waitForText userInput="4 interest-free payments of $25.00. No late fees." selector="{{StorefrontPayPalPayLaterSection.payPalPayLaterMessage}}" stepKey="verifyPayPalPayLaterMessage1"/>
         <closeTab stepKey="closeCurrentTab"/>
         <actionGroup ref="AdminOpenConfigurationStoresPageActionGroup" stepKey="openAdminPage"/>
         <!-- Set up catalog to store product price including tax -->
@@ -109,7 +111,7 @@
         <actionGroup ref="SwitchToPayPalGroupBtnActionGroup" stepKey="clickPayPalBtnAgain"/>
         <!--Scroll down to paypal pay later option and verify message-->
         <switchToNextTab stepKey="switchToInContentTab"/>
-        <waitForText userInput="4 payments of $23.10 due every 2 weeks, starting today." selector="{{StorefrontPayPalPayLaterSection.payPalPayLaterMessage}}" stepKey="verifyPayPalPayLaterMessageAfterTax"/>
+        <waitForText userInput="4 interest-free payments of $23.10. No late fees." selector="{{StorefrontPayPalPayLaterSection.payPalPayLaterMessage}}" stepKey="verifyPayPalPayLaterMessageAfterTax"/>
     </test>
 </tests>
 
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderItemsOrderedSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderItemsOrderedSection.xml
@@ -39,5 +39,7 @@
         <element name="totalColumn" type="text" selector=".edit-order-table .col-total .price"/>
         <element name="customOption" type="text" selector=". //dl[@class='item-options']/dt[text()='{{optionValue1}}']/../dd[{{optionValue2}}]" parameterized="true"/>
         <element name="nameOfProduct" type="text" selector="//div[@class='product-title' and contains(text(), '{{productName}}')]" parameterized="true"/>
+        <element name="itemsOrderedStatus" type="text" selector="//table[contains(@class, 'edit-order-table')]//tr[td[contains(@class, 'col-product') and contains(., '{{productSku}}')]]/td[contains(@class, 'col-status')]" parameterized="true"/>
+        <element name="backOrdered" type="text" selector="//table[contains(@class, 'edit-order-table')]//tr[td[contains(@class, 'col-product') and contains(., '{{productSku}}')] ]//td[contains(@class, 'col-ordered-qty')]//tr[th[contains(., 'Backordered')]]/td" parameterized="true"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderWithBackOrderQtyEnabledProductTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderWithBackOrderQtyEnabledProductTest.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
+ */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminCreateOrderWithBackOrderQtyEnabledProductTest">
+        <annotations>
+            <features value="Sales"/>
+            <stories value="Backorders"/>
+            <title value="Backordered quantity is visible on order item level in backend"/>
+            <description value="Ensure that backordered quantity is displayed at item level in admin order details when backorders are allowed."/>
+            <testCaseId value="AC-12061"/>
+            <severity value="AVERAGE"/>
+            <group value="sales"/>
+        </annotations>
+        <before>
+            <!-- Create product and customer -->
+            <createData entity="SimpleProductInStockQuantityZero" stepKey="createProduct"/>
+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <!-- Delete created data -->
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
+        </after>
+        <!-- Step1: Open created product and allow backorders -->
+        <actionGroup ref="NavigateToCreatedProductEditPageActionGroup" stepKey="openCreatedProductEditPage">
+            <argument name="product" value="$$createProduct$$"/>
+        </actionGroup>
+        <actionGroup ref="AdminClickOnAdvancedInventoryLinkActionGroup" stepKey="clickOnAdvancedInventoryLink"/>
+        <actionGroup ref="AdminSetBackordersOnProductAdvancedInventoryActionGroup" stepKey="allowBackorders"/>
+        <actionGroup ref="AdminFillAdvancedInventoryQtyActionGroup" stepKey="fillProductQty">
+            <argument name="qty" value="-5"/>
+        </actionGroup>
+        <actionGroup ref="AdminSubmitAdvancedInventoryFormActionGroup" stepKey="clickDoneButton"/>
+        <actionGroup ref="SaveProductFormActionGroup" stepKey="saveProduct"/>
+        <!-- Step2: Create Order -->
+        <actionGroup ref="AdminNavigateToNewOrderPageExistingCustomerActionGroup" stepKey="navigateToNewOrderPage">
+            <argument name="customer" value="$createCustomer$"/>
+        </actionGroup>
+        <actionGroup ref="AddSimpleProductToOrderActionGroup" stepKey="addProduct">
+            <argument name="product" value="$createProduct$"/>
+        </actionGroup>
+        <actionGroup ref="FillOrderCustomerInformationActionGroup" stepKey="fillCustomerInfo">
+            <argument name="customer" value="$createCustomer$"/>
+            <argument name="address" value="US_Address_TX"/>
+        </actionGroup>
+        <actionGroup ref="OrderSelectFlatRateShippingActionGroup" stepKey="selectFlatRate"/>
+        <!-- Submit order -->
+        <actionGroup ref="AdminSubmitOrderActionGroup" stepKey="submitOrder"/>
+        <!-- Step3: Create Invoice for this Order and verify backorder -->
+        <actionGroup ref="StartCreateInvoiceFromOrderPageActionGroup" stepKey="createInvoice"/>
+        <actionGroup ref="SubmitInvoiceActionGroup" stepKey="submitInvoice"/>
+        <waitForText selector="{{AdminOrderItemsOrderedSection.itemsOrderedStatus($$createProduct.sku$$)}}" userInput="Invoiced" stepKey="verifyItemStatusAfterInvoice"/>
+        <waitForText selector="{{AdminOrderItemsOrderedSection.backOrdered($$createProduct.sku$$)}}" userInput="1" stepKey="verifyBackOrderedAfterInvoice"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminDeleteAllTaxRulesActionGroup.xml b/app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminDeleteAllTaxRulesActionGroup.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright 2025 Adobe
+  * All Rights Reserved.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminDeleteAllTaxRulesActionGroup">
+        <annotations>
+            <description>Deletes all rows one by one on the 'Tax Rules' page.</description>
+        </annotations>
+        <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRuleGridPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad1"/>
+        <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters"/>
+        <helper class="Magento\Tax\Test\Mftf\Helper\TaxHelpers" method="deleteAllSpecifiedTaxRuleRows" stepKey="deleteAllSpecifiedTaxRules">
+            <argument name="rowsToDelete">{{AdminTaxRuleGridSection.allRows}}</argument>
+            <argument name="deleteButton">{{AdminMainActionsSection.delete}}</argument>
+            <argument name="modalAcceptButton">{{AdminConfirmationModalSection.ok}}</argument>
+            <argument name="successMessage">{{TaxRuleSuccessMessages.delete}}</argument>
+            <argument name="successMessageContainer">{{AdminMessagesSection.success}}</argument>
+        </helper>
+        <waitForPageLoad stepKey="waitForGridLoad"/>
+        <seeNumberOfElements userInput="0" selector="{{AdminTaxRuleGridSection.allRows}}" stepKey="seeExpectedFinalTotalRows"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Tax/Test/Mftf/Data/TaxRuleData.xml b/app/code/Magento/Tax/Test/Mftf/Data/TaxRuleData.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
+  * Copyright 2018 Adobe
+  * All Rights Reserved.
   */
 -->
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -164,4 +164,7 @@
     <entity name="ShippingGood" type="taxRule">
         <data key="name" unique="suffix">ShippingGood</data>
     </entity>
+    <entity name="TaxRuleSuccessMessages">
+        <data key="delete">The tax rule has been deleted.</data>
+    </entity>
 </entities>
diff --git a/app/code/Magento/Tax/Test/Mftf/Section/AdminTaxRuleGridSection.xml b/app/code/Magento/Tax/Test/Mftf/Section/AdminTaxRuleGridSection.xml
diff --git a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderApiConfigurableVariationsPriceTest.php b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderApiConfigurableVariationsPriceTest.php
diff --git a/dev/tests/integration/testsuite/Magento/Integration/_files/integration_all_data.php b/dev/tests/integration/testsuite/Magento/Integration/_files/integration_all_data.php
