ACQE-8932:Verify cart price rule with product subselection quantity condition applies discount

- Changes done on test file and action group as per latest comments

Author: Pavan-bj

app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCreateCartPriceRuleWithProductSubselectionActionGroup.xml

@@ -5,8 +5,9 @@
  * All Rights Reserved.
  */
 -->
+
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="AdminCreateCartPriceRuleWithProductSubselectionActionGroup" extends="AdminCreateCartPriceRuleActionGroup">
         <annotations>
             <description>Create a complete cart price rule with product subselection quantity condition and save it.</description>
@@ -16,16 +17,18 @@
             <argument name="ruleToChange1" type="string" defaultValue="is"/>
             <argument name="rule1" type="string" defaultValue="equals or greater than"/>
             <argument name="ruleToChange2" type="string" defaultValue="..."/>
-            <argument name="rule2" type="string" defaultValue="2"/>
+            <argument name="rule2" type="string" defaultValue="1"/>
         </arguments>
         <!--Go to Conditions section-->
-        <click selector="{{AdminCartPriceRulesFormSection.conditionsHeader}}" stepKey="openConditionsSection" after="selectActionType"/>
-        <click selector="{{AdminCartPriceRulesFormSection.addCondition('1')}}" stepKey="addFirstCondition" after="openConditionsSection"/>
+        <waitForElementClickable selector="{{AdminCartPriceRulesFormSection.conditionsHeader}}" stepKey="waitForOpenConditionsSection" after="selectActionType"/>
+        <click selector="{{AdminCartPriceRulesFormSection.conditionsHeader}}" stepKey="openConditionsSection" after="waitForOpenConditionsSection"/>
+        <waitForElementClickable selector="{{AdminCartPriceRulesFormSection.addCondition('1')}}" stepKey="waitForAddFirstCondition" after="openConditionsSection"/>
+        <click selector="{{AdminCartPriceRulesFormSection.addCondition('1')}}" stepKey="addFirstCondition" after="waitForAddFirstCondition"/>
         <selectOption selector="{{AdminCartPriceRulesFormSection.ruleCondition('1')}}" userInput="{{condition1}}" stepKey="selectRule" after="addFirstCondition"/>
-        <waitForElementVisible selector="{{AdminCartPriceRulesFormSection.ruleParameter(ruleToChange1)}}" stepKey="waitForFirstRuleElement" after="selectRule"/>
+        <waitForElementClickable selector="{{AdminCartPriceRulesFormSection.ruleParameter(ruleToChange1)}}" stepKey="waitForFirstRuleElement" after="selectRule"/>
         <click selector="{{AdminCartPriceRulesFormSection.ruleParameter(ruleToChange1)}}" stepKey="clickToChangeRule" after="waitForFirstRuleElement"/>
         <selectOption selector="{{AdminCartPriceRulesFormSection.ruleParameterSelect('1--1')}}" userInput="{{rule1}}" stepKey="selectRule1" after="clickToChangeRule"/>
-        <waitForElementVisible selector="{{AdminCartPriceRulesFormSection.ruleParameter(ruleToChange2)}}" stepKey="waitForSecondRuleElement" after="selectRule1"/>
+        <waitForElementClickable selector="{{AdminCartPriceRulesFormSection.ruleParameter(ruleToChange2)}}" stepKey="waitForSecondRuleElement" after="selectRule1"/>
         <click selector="{{AdminCartPriceRulesFormSection.ruleParameter(ruleToChange2)}}" stepKey="clickToChangeRule1" after="waitForSecondRuleElement"/>
         <fillField selector="{{AdminCartPriceRulesFormSection.ruleParameterInput('1--1')}}" userInput="{{rule2}}" stepKey="fillRule" after="clickToChangeRule1"/>
     </actionGroup>

app/code/Magento/SalesRule/Test/Mftf/ActionGroup/StorefrontAssertDiscountAmountOnPaymentPageActionGroup.xml

@@ -5,19 +5,21 @@
  * All Rights Reserved.
  */
 -->
+
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="StorefrontAssertDiscountAmountOnPaymentPageActionGroup">
+        <annotations>
+            <description>In storefront product page assert cart price discount is applied</description>
+        </annotations>
         <arguments>
             <argument name="discountPrice" type="string"/>
         </arguments>
-
-        <waitForElement selector="{{CheckoutPaymentSection.placeOrder}}"  stepKey="waitForPlaceOrderButton"/>
+        <waitForElementVisible selector="{{CheckoutPaymentSection.placeOrder}}"  stepKey="waitForPlaceOrderButton"/>
         <grabTextFrom selector="{{CheckoutPaymentSection.discountPrice}}" stepKey="grabDiscountPrice"/>
         <assertEquals stepKey="checkRewardPoints">
             <expectedResult type="string">{{discountPrice}}</expectedResult>
             <actualResult type="string">{$grabDiscountPrice}</actualResult>
         </assertEquals>
-
     </actionGroup>
 </actionGroups>

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

@@ -11,15 +11,15 @@
     <test name="AdminVerifySalesRuleProductSubselectionWithQuantityConditionTest">
         <annotations>
             <features value="SalesRule"/>
-            <stories value="Cart Price Rule with Product Subselection"/>
+            <stories value="Cart price rule with product subselection"/>
             <title value="Verify cart price rule with product subselection quantity condition applies discount"/>
             <description value="Verify that cart price rule with product subselection condition Qty >= 1 successfully applies discount at checkout"/>
-            <severity value="CRITICAL"/>
+            <severity value="MINOR"/>
             <testCaseId value="AC-15273"/>
             <group value="salesRule"/>
         </annotations>
         <before>
-            <!-- Admin Login -->
+            <!-- Admin login -->
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
             <createData entity="_defaultProduct" stepKey="createSimpleProduct"/>
         </before>
@@ -31,17 +31,12 @@
             <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearFilters"/>
             <!-- Delete created product -->
             <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
-            <!-- Admin Logout -->
-            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+            <!-- Admin logout -->
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <!-- Step 1-2: Create cart price rule with product subselection (Qty >= 1) -->
         <actionGroup ref="AdminCreateCartPriceRuleWithProductSubselectionActionGroup" stepKey="createRule">
             <argument name="ruleName" value="TestSalesRule"/>
-            <argument name="condition1" value="Products subselection"/>
-            <argument name="ruleToChange1" value="is"/>
-            <argument name="rule1" value="equals or greater than"/>
-            <argument name="ruleToChange2" value="..."/>
-            <argument name="rule2" value="1"/>
         </actionGroup>
         <!-- Step 3: Run cron job -->
         <actionGroup ref="CliIndexerReindexActionGroup" stepKey="runCronReindex">
@@ -63,7 +58,7 @@
         <actionGroup ref="AssertStorefrontCartDiscountActionGroup" stepKey="seeDiscountTotal">
             <argument name="discount" value="61.50"/>
         </actionGroup>
-        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart"/>
+        <actionGroup ref="StorefrontClickProceedToCheckoutActionGroup" stepKey="clickProceedToCheckout"/>
         <actionGroup ref="GuestCheckoutFillingShippingSectionActionGroup" stepKey="guestCheckoutFillingShippingSection">
             <argument name="customerVar" value="CustomerEntityOne" />
             <argument name="customerAddressVar" value="CustomerAddressSimple" />