From 15fdf8da649ec743c1bfc701f69ab73e113a5847 Mon Sep 17 00:00:00 2001
From: Shikha Mishra <mshikha1103@gmail.com>
Date: Mon, 19 Oct 2020 11:08:04 +0530
Subject: [PATCH] #30255: Fixed The coupon code has been accepted message

Added after action for disable Flatrate in MFTF test
Added Verification for previous message removed
---
 .../AdminRemoveCouponFromOrderActionGroup.xml |  1 +
 ...erToVerifyApplyAndRemoveCouponCodeTest.xml | 30 +++++++++++++------
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminRemoveCouponFromOrderActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminRemoveCouponFromOrderActionGroup.xml
index 4207b96eff8ce..75457401eea5d 100644
--- a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminRemoveCouponFromOrderActionGroup.xml
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminRemoveCouponFromOrderActionGroup.xml
@@ -11,6 +11,7 @@
     <actionGroup name="AdminRemoveCouponFromOrderActionGroup">
         <click selector="{{AdminOrderFormItemsSection.removeCoupon}}" stepKey="removeCoupon"/>
         <waitForPageLoad stepKey="waitForRemovingCoupon"/>
+        <dontSee selector="{{AdminOrderDetailsMessagesSection.successMessage}}" userInput="The coupon code has been accepted." stepKey="dontSeePreviousMessage"/>
         <see selector="{{AdminOrderDetailsMessagesSection.successMessage}}" userInput="The coupon code has been removed." stepKey="seeSuccessMessage"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderToVerifyApplyAndRemoveCouponCodeTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderToVerifyApplyAndRemoveCouponCodeTest.xml
index 0b3b45129e0c0..e1c517be6c857 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderToVerifyApplyAndRemoveCouponCodeTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderToVerifyApplyAndRemoveCouponCodeTest.xml
@@ -36,15 +36,24 @@
             </createData>
 
             <!-- Enable Bank Transfer payment -->
-            <magentoCLI command="config:set {{EnablePaymentBankTransferConfigData.path}} {{EnablePaymentBankTransferConfigData.value}}" stepKey="enableBankTransferPayment"/>
+            <magentoCLI
+                command="config:set {{EnablePaymentBankTransferConfigData.path}} {{EnablePaymentBankTransferConfigData.value}}"
+                stepKey="enableBankTransferPayment"/>
 
             <!--Set default flat rate shipping method settings-->
-            <magentoCLI command="config:set {{EnableFlatRateConfigData.path}} {{EnableFlatRateConfigData.value}}" stepKey="enableFlatRate"/>
+            <magentoCLI command="config:set {{EnableFlatRateConfigData.path}} {{EnableFlatRateConfigData.value}}"
+                        stepKey="enableFlatRate"/>
         </before>
         <after>
             <!-- Disable Bank Transfer payment -->
-            <magentoCLI command="config:set {{DisablePaymentBankTransferConfigData.path}} {{DisablePaymentBankTransferConfigData.value}}" stepKey="disableBankTransferPayment"/>
-            
+            <magentoCLI
+                command="config:set {{DisablePaymentBankTransferConfigData.path}} {{DisablePaymentBankTransferConfigData.value}}"
+                stepKey="disableBankTransferPayment"/>
+
+            <!--Disable flat rate shipping method-->
+            <magentoCLI command="config:set {{DisableFlatRateConfigData.path}} {{DisableFlatRateConfigData.value}}"
+                        stepKey="disableFlatRate"/>
+
             <!-- Delete sales rule -->
             <deleteData createDataKey="createCartPriceRule" stepKey="deleteCartPriceRule"/>
 
@@ -72,7 +81,7 @@
         <actionGroup ref="AdminApplyCouponToOrderActionGroup" stepKey="applyCoupon">
             <argument name="couponCode" value="$$createCouponForCartPriceRule.code$$"/>
         </actionGroup>
-        
+
         <!-- Remove coupon from the order -->
         <actionGroup ref="AdminRemoveCouponFromOrderActionGroup" stepKey="removeCoupon"/>
 
@@ -80,9 +89,12 @@
         <actionGroup ref="AdminSelectFlatRateShippingMethodActionGroup" stepKey="selectFlatRateShippingMethod"/>
 
         <!-- Select bank Transfer payment method -->
-        <waitForElementVisible selector="{{AdminOrderFormPaymentSection.paymentBlock}}" stepKey="waitForPaymentOptions"/>
-        <conditionalClick selector="{{AdminOrderFormPaymentSection.bankTransferOption}}" dependentSelector="{{AdminOrderFormPaymentSection.bankTransferOption}}" visible="true" stepKey="checkBankTransferOption"/>
-        
+        <waitForElementVisible selector="{{AdminOrderFormPaymentSection.paymentBlock}}"
+                               stepKey="waitForPaymentOptions"/>
+        <conditionalClick selector="{{AdminOrderFormPaymentSection.bankTransferOption}}"
+                          dependentSelector="{{AdminOrderFormPaymentSection.bankTransferOption}}" visible="true"
+                          stepKey="checkBankTransferOption"/>
+
         <!-- Submit order -->
         <actionGroup ref="AdminSubmitOrderActionGroup" stepKey="submitOrder"/>
 
@@ -97,4 +109,4 @@
         </actionGroup>
         <click selector="{{AdminDataGridTableSection.firstRow}}" stepKey="clickCreatedOrderInGrid"/>
     </test>
-</tests>
\ No newline at end of file
+</tests>