ACP2E-690: Discount code Times Used is being counted twice

Author: pradeep1819

app/code/Magento/SalesRule/Test/Mftf/Test/AdminCouponCodeCheckTimesUsedAfterGuestOrderTest.xml

@@ -28,23 +28,23 @@
         <after>
             <!--Delete simple product created during the test-->
             <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
-            <!--Delete the cart price rule we made during the test-->
-            <actionGroup ref="DeleteCartPriceRuleByName" stepKey="cleanUpRule">
-                <argument name="ruleName" value="{{CatPriceRule.name}}"/>
-            </actionGroup>
             <!--Delete customer created during the test-->
             <actionGroup ref="DeleteCustomerByEmailActionGroup" stepKey="deleteCustomer">
                 <argument name="email" value="{{CustomerEntityOne.email}}"/>
             </actionGroup>
+            <!--Delete the cart price rule we made during the test-->
+            <actionGroup ref="DeleteCartPriceRuleByName" stepKey="cleanUpRule">
+                <argument name="ruleName" value="{{CatPriceRule.name}}"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="adminLogout"/>
         </after>
 
         <!--Go to admin Marketing > Cart Price Rule Page-->
         <actionGroup ref="AdminOpenCartPriceRulesPageActionGroup" stepKey="amOnCartPriceList"/>
 
         <!--Create a new rule with specified details below-->
-        <click selector="{{AdminCartPriceRulesSection.addNewRuleButton}}" stepKey="clickAddNewRule" after="amOnCartPriceList"/>
-        <fillField selector="{{AdminCartPriceRulesFormSection.ruleName}}" userInput="{{CatPriceRule.name}}" stepKey="fillRuleName" after="clickAddNewRule"/>
+        <click selector="{{AdminCartPriceRulesSection.addNewRuleButton}}" stepKey="clickAddNewRule"/>
+        <fillField selector="{{AdminCartPriceRulesFormSection.ruleName}}" userInput="{{CatPriceRule.name}}" stepKey="fillRuleName"/>
         <selectOption selector="{{AdminCartPriceRulesFormSection.websites}}" userInput="{{CartPriceRuleConditionAndFreeShippingApplied.websites}}" stepKey="selectWebsites"/>
         <selectOption selector="{{AdminCartPriceRulesFormSection.customerGroups}}" parameterArray="[{{CatPriceRule.customerGroups}}]" stepKey="selectCustomerGroup"/>
 
@@ -54,41 +54,40 @@
         <fillField selector="{{AdminCartPriceRulesFormSection.userPerCustomer}}" userInput="1" stepKey="fillUsesPerCustomer"/>
 
         <!--Navigate to Actions tab and set the specified details-->
-        <click selector="{{AdminCartPriceRulesFormSection.actionsHeader}}" stepKey="clickToExpandActions" after="fillUsesPerCustomer"/>
+        <click selector="{{AdminCartPriceRulesFormSection.actionsHeader}}" stepKey="clickToExpandActions"/>
         <selectOption selector="{{AdminCartPriceRulesFormSection.apply}}" userInput="{{CatPriceRule.apply}}" stepKey="selectActionType"/>
         <fillField selector="{{AdminCartPriceRulesFormSection.discountAmount}}" userInput="{{CatPriceRule.discountAmount}}" stepKey="fillDiscountAmount"/>
         <click selector="{{AdminCartPriceRulesFormSection.saveAndContinue}}" stepKey="clickSaveAndContinueButton"/>
         <waitForPageLoad stepKey="waitForPageToLoad"/>
 
         <!-- Navigate to Manage Coupon Codes section to generate 5 coupon code -->
-        <click selector="{{AdminCartPriceRulesFormSection.manageCouponCodesHeader}}" stepKey="expandCouponSection" after="clickSaveAndContinueButton"/>
-        <fillField selector="{{AdminCartPriceRulesFormSection.couponQty}}" userInput="5" stepKey="fillCouponQty"/>
+        <click selector="{{AdminCartPriceRulesFormSection.manageCouponCodesHeader}}" stepKey="expandCouponSection"/>
+        <fillField selector="{{AdminCartPriceRulesFormSection.couponQty}}" userInput="1" stepKey="fillCouponQty"/>
         <click selector="{{AdminCartPriceRulesFormSection.generateCouponsButton}}" stepKey="clickGenerate"/>
         <see selector="{{AdminCartPriceRulesFormSection.successMessage}}" userInput="Message is added to queue, wait to get your coupons soon" stepKey="seeGenerationSuccess"/>
 
         <!--Start coupon code generator queue-->
         <actionGroup ref="CliConsumerStartActionGroup" stepKey="startMessageQueue">
             <argument name="consumerName" value="{{AdminCodeGeneratorMessageConsumerData.consumerName}}"/>
-            <argument name="maxMessages" value="5"/>
+            <argument name="maxMessages" value="1"/>
         </actionGroup>
 
         <!--Reload cart price rule page-->
-        <actionGroup ref="ReloadPageActionGroup" stepKey="refreshPage" after="startMessageQueue"/>
+        <actionGroup ref="ReloadPageActionGroup" stepKey="refreshPage"/>
 
         <!--Open Manage Coupon Codes tab again to see generated coupon codes-->
-        <click selector="{{AdminCartPriceRulesFormSection.manageCouponCodesHeader}}" stepKey="expandCouponSectionSecondTime" after="refreshPage"/>
-        <scrollTo selector="{{AdminCartPriceRulesFormSection.couponGridUsedHeader}}" stepKey="scrollToCouponGridUsedHeader" after="expandCouponSectionSecondTime"/>
-        <waitForElementVisible selector="{{AdminCartPriceRulesFormSection.couponGridUsedHeader}}"  stepKey="waitForNewRule" after="scrollToCouponGridUsedHeader"/>
+        <click selector="{{AdminCartPriceRulesFormSection.manageCouponCodesHeader}}" stepKey="expandCouponSectionSecondTime"/>
+        <scrollTo selector="{{AdminCartPriceRulesFormSection.couponGridUsedHeader}}" stepKey="scrollToCouponGridUsedHeader"/>
+        <waitForElementVisible selector="{{AdminCartPriceRulesFormSection.couponGridUsedHeader}}"  stepKey="waitForNewRule"/>
 
         <!--Assert coupon codes grid header is correct -->
-        <see selector="{{AdminCartPriceRulesFormSection.couponGridUsedHeader}}" userInput="Used" stepKey="seeCorrectUsedHeader" after="waitForNewRule"/>
+        <see selector="{{AdminCartPriceRulesFormSection.couponGridUsedHeader}}" userInput="Used" stepKey="seeCorrectUsedHeader"/>
 
         <!--Grab a coupon code and hold on to it for later -->
         <grabTextFrom selector="{{AdminCartPriceRulesFormSection.generatedCouponByIndex('1')}}" stepKey="couponCode"/>
 
-
         <!--Open the Product Page, add the product to Cart, go to Shopping Cart and Apply the same coupon code -->
-        <amOnPage url="{{StorefrontProductPage.url($$createSimpleProduct.custom_attributes[url_key]$$)}}" stepKey="openProductPage" after="couponCode"/>
+        <amOnPage url="{{StorefrontProductPage.url($$createSimpleProduct.custom_attributes[url_key]$$)}}" stepKey="openProductPage"/>
         <actionGroup ref="ApplyCartRuleOnStorefrontActionGroup" stepKey="applyCartPriceRule">
             <argument name="product" value="$$createSimpleProduct$$"/>
             <argument name="couponCode" value="{$couponCode}"/>
@@ -112,27 +111,26 @@
         </actionGroup>
 
         <!-- Create Customer using guest details while placing an order -->
-        <actionGroup ref="StorefrontRegisterCustomerFromOrderSuccessPage" stepKey="createCustomerAfterPlaceOrder" after="guestPlaceOrder">
+        <actionGroup ref="StorefrontRegisterCustomerFromOrderSuccessPage" stepKey="createCustomerAfterPlaceOrder">
             <argument name="customer" value="CustomerEntityOne"/>
         </actionGroup>
 
-        <!-- Run cron three times to force update and wait 2 minutes -->
         <!-- Run cron -->
         <magentoCron stepKey="runAllCronJobs"/>
         <reloadPage stepKey="refreshPageAfterCronRun"/>
 
         <!-- Search and go to cart price rule page again -->
-        <amOnPage url="{{AdminCartPriceRulesPage.url}}" stepKey="amOnCartPriceListSecondTime" after="refreshPageAfterCronRun"/>
+        <amOnPage url="{{AdminCartPriceRulesPage.url}}" stepKey="amOnCartPriceListSecondTime"/>
         <waitForPageLoad stepKey="waitForPriceList"/>
         <fillField selector="{{AdminCartPriceRulesSection.filterByNameInput}}" userInput="{{CatPriceRule.name}}" stepKey="filterByName"/>
         <click selector="{{AdminCartPriceRulesSection.searchButton}}" stepKey="doFilter"/>
         <click selector="{{AdminCartPriceRulesSection.rowByIndex('1')}}" stepKey="goToEditRulePage"/>
-        <click selector="{{AdminCartPriceRulesFormSection.manageCouponCodesHeader}}" stepKey="expandCouponSectionThirdTime" after="goToEditRulePage"/>
-        <scrollTo selector="{{AdminCartPriceRulesFormSection.couponGridUsedHeader}}" stepKey="scrollToCouponGridUsedHeaderSecondTime" after="expandCouponSectionThirdTime"/>
-        <waitForElementVisible selector="{{AdminCartPriceRulesFormSection.couponGridUsedHeader}}"  stepKey="waitForCouponGridToLoad" after="scrollToCouponGridUsedHeaderSecondTime"/>
+        <click selector="{{AdminCartPriceRulesFormSection.manageCouponCodesHeader}}" stepKey="expandCouponSectionThirdTime"/>
+        <scrollTo selector="{{AdminCartPriceRulesFormSection.couponGridUsedHeader}}" stepKey="scrollToCouponGridUsedHeaderSecondTime"/>
+        <waitForElementVisible selector="{{AdminCartPriceRulesFormSection.couponGridUsedHeader}}"  stepKey="waitForCouponGridToLoad"/>
 
         <!--Verify coupon does not used twice-->
         <see userInput="1" selector="{{AdminCartPriceRulesFormSection.generatedCouponTimesUsed('1')}}" stepKey="seeTimesUsed"/>
-        <wait time="5" stepKey="waitToSeeTimesUsed" after="seeTimesUsed"/>
+        <wait time="5" stepKey="waitToSeeTimesUsed"/>
     </test>
 </tests>