ACQE-6733 : Verify Terms and Conditions

Modified actionGroup

Author: glo74186

app/code/Magento/CheckoutAgreements/Test/Mftf/ActionGroup/StorefrontTermInCheckoutAndPlaceOrderActionGroup.xml

@@ -13,19 +13,12 @@
             <argument name="termCheckboxText" type="string"/>
         </arguments>
         <!--Check if agreement is present on checkout and select it-->
-        <scrollTo selector=".checkout-agreements-block" stepKey="scrollToCheckoutAgreementBlock"/>
-        <click selector=".checkout-agreements-block" stepKey="waitForCheckoutAgreementBlockToBeClickable"/>
-        <waitForText selector="{{StorefrontCheckoutAgreementsSection.checkoutAgreementButton}}" userInput="{{termCheckboxText}}" stepKey="seeTermInCheckout"/>
+        <scrollTo selector="{{StorefrontCheckoutAgreementsSection.checkoutAgreementBlock}}" stepKey="scrollToCheckoutAgreementBlock"/>
         <waitForElementClickable selector="{{StorefrontCheckoutAgreementsSection.checkoutAgreementCheckbox}}" stepKey="waitForCheckAgreementToBeClickable"/>
         <selectOption selector="{{StorefrontCheckoutAgreementsSection.checkoutAgreementCheckboxInput}}" userInput="{{termCheckboxText}}" stepKey="checkAgreement"/>
-
         <!--Checkout select Check/Money Order payment-->
-        <waitForPageLoad stepKey="waitForPaymentPageRendering"/>
-        <waitForPageLoad stepKey="waitForPaymentRendering"/>
-        <conditionalClick selector="{{StorefrontCheckoutPaymentMethodSection.checkPaymentMethodByName('Check / Money order')}}" dependentSelector="{{StorefrontCheckoutPaymentMethodSection.checkPaymentMethodByName('Check / Money order')}}" visible="true" stepKey="selectCheckmoPaymentMethod"/>
-        <waitForPageLoad stepKey="waitForLoadingMaskAfterPaymentMethodSelection"/>
-
-        <!--Click Place Order button-->
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <waitForElementClickable selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="waitForPlaceOrderButtonClickable"/>
         <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder"/>
         <waitForPageLoad stepKey="waitForOrderPlaced"/>
     </actionGroup>

app/code/Magento/CheckoutAgreements/Test/Mftf/Section/StorefrontCheckoutAgreementsSection.xml

@@ -10,12 +10,12 @@
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="StorefrontCheckoutAgreementsSection">
         <element name="checkoutAgreementCheckboxInput" type="checkbox" selector="input#agreement_checkmo_3.required-entry"/>
+        <element name="checkoutAgreementBlock" type="checkbox" selector=".checkout-agreements-block"/>
         <element name="checkoutAgreementCheckbox" type="checkbox" selector="div.checkout-agreement.field.choice.required > input"/>
         <element name="checkoutAgreementButton" type="button" selector="div.checkout-agreements-block > div > div > div > label > button > span"/>
         <element name="checkoutAgreementErrorMessage" type="button" selector="div.checkout-agreement.field.choice.required > div.mage-error"/>
         <element name="checkoutAgreementCheckboxcheck" type="checkbox" selector="//span[text()='{{agreementname}}']/../../../input[@type='checkbox']" parameterized="true"/>
         <element name="contentArea" type="text" selector="//div[@class='modals-wrapper']//aside[@class='modal-popup agreements-modal modal-slide _inner-scroll _show']//div[@class='checkout-agreements-item-content' and contains(text(), '{{contentText}}')]" parameterized="true"/>
         <element name="close" type="button" selector="//div[@class='modals-wrapper']//aside[@class='modal-popup agreements-modal modal-slide _inner-scroll _show']//footer//span"/>
-        <element name="defaultPaymentAgreementCheckboxCheck" type="checkbox" selector="//div[@class='payment-method _active']//span[text()='{{agreementName}}']/../../../input[@type='checkbox']" parameterized="true"/>
     </section>
 </sections>