Merge branch 'ACQE-8923' into ACQE-functional-deployment-version22

Author: chandrakalahanchinal

app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalExpressCheckoutWithDiscountCouponTest.xml

@@ -34,8 +34,13 @@
             </createData>
         </before>
         <after>
-            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
-            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
+            <!-- Logout customer first -->
+            <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer"/>
+            <!-- Delete via Admin UI instead of API -->
+            <actionGroup ref="AdminDeleteCustomerActionGroup" stepKey="deleteCustomer">
+                <argument name="customerEmail" value="$$createCustomer.email$$"/>
+            </actionGroup>
+            <actionGroup ref="DeleteAllProductsUsingProductGridActionGroup" stepKey="deleteProduct" />
             <!-- Delete Cart Price Rule -->
             <deleteData createDataKey="createCartPriceRule" stepKey="deleteCartPriceRule"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>

app/code/Magento/Paypal/Test/Mftf/Test/StorefrontRewardPointsAppliedAfterApplyingCouponTest.xml

@@ -53,9 +53,13 @@
         <after>
             <magentoCLI command="config:set payment/paypal_express/active 0" stepKey="disablePayPalExpress"/>
             <magentoCLI command="config:set {{StorefrontPaypalExpressAuthorizationPaymentActionOptionConfigData.path}} {{StorefrontPaypalExpressAuthorizationPaymentActionOptionConfigData.value}}" stepKey="setPaymentAction"/>
+            <!-- Logout customer first -->
             <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer"/>
-            <actionGroup ref="AdminDeleteAllCustomerActionGroup" stepKey="deleteCustomer"/>
-            <actionGroup ref="DeleteAllProductsUsingProductGridActionGroup" stepKey="deleteProduct"/>
+            <!-- Delete via Admin UI instead of API -->
+            <actionGroup ref="AdminDeleteCustomerActionGroup" stepKey="deleteCustomer">
+                <argument name="customerEmail" value="$$createCustomer.email$$"/>
+            </actionGroup>
+            <actionGroup ref="DeleteAllProductsUsingProductGridActionGroup" stepKey="deleteProduct" />
             <!--Delete cart price rule-->
             <actionGroup ref="DeleteCartPriceRuleByName" stepKey="deleteCartPriceRule">
                 <argument name="ruleName" value="{{_defaultCoupon.code}}"/>