Merge branch '2.4.8-beta1-develop' into AC-11446

Author: mrprabhu92

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

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminDisableTermsAndConditionsConfigurationActionGroup">
+        <annotations>
+            <description>Disable Terms and Conditions On Configuration page.</description>
+        </annotations>
+
+        <magentoCLI command="config:set {{disableTermsAndConditions.path}} {{disableTermsAndConditions.value}}" stepKey="DisableTermsAndConditions"/>
+    </actionGroup>
+</actionGroups>

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

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminEnableTermsAndConditionsConfigurationActionGroup">
+        <annotations>
+            <description>Enable Terms and Conditions On Configuration page.</description>
+        </annotations>
+
+        <magentoCLI command="config:set {{enableTermsAndConditions.path}} {{enableTermsAndConditions.value}}" stepKey="EnableTermsAndConditions"/>
+    </actionGroup>
+</actionGroups>

app/code/Magento/CheckoutAgreements/Test/Mftf/Data/TermData.xml

@@ -53,4 +53,21 @@
         <data key="checkboxText" unique="suffix">test_checkbox</data>
         <data key="content" unique="suffix">TestMessage</data>
     </entity>
+    <entity name="enableTermsAndConditions" type="term">
+        <data key="path">checkout/options/enable_agreements</data>
+        <data key="value">1</data>
+    </entity>
+    <entity name="disableTermsAndConditions" type="term">
+        <data key="path">checkout/options/enable_agreements</data>
+        <data key="value">0</data>
+    </entity>
+    <entity name="newHtmlAutomaticallyTerm" type="term">
+        <data key="name" unique="suffix">Test name</data>
+        <data key="isActive">Enabled</data>
+        <data key="isHtml">HTML</data>
+        <data key="mode">Automatically</data>
+        <data key="storeView">Default Store View</data>
+        <data key="checkboxText" unique="suffix">test_checkbox</data>
+        <data key="content" unique="suffix">TestMessage</data>
+    </entity>
 </entities>

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

@@ -13,5 +13,7 @@
         <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"/>
     </section>
 </sections>

app/code/Magento/Sales/Test/Mftf/Test/AdminReorderWithCatalogPriceRuleDiscountTest.xml

@@ -65,13 +65,16 @@
         <!--Verify order item row-->
         <waitForElementVisible selector="{{AdminOrderItemsOrderedSection.productPrice('2')}}" stepKey="waitOrderItemPriceToBeVisible"/>
         <see selector="{{AdminOrderItemsOrderedSection.productPrice('2')}}" userInput="{{AdminOrderSimpleProductWithCatalogRule.subtotal}}" stepKey="seeOrderItemPrice"/>
+        <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache1">
+            <argument name="tags" value=""/>
+        </actionGroup>
         <!--Verify totals on Order page-->
         <scrollTo selector="{{AdminOrderFormTotalSection.grandTotal}}" stepKey="scrollToOrderGrandTotal"/>
         <waitForElementVisible selector="{{AdminOrderFormTotalSection.total('Subtotal')}}" stepKey="waitOrderSubtotalToBeVisible"/>
         <see selector="{{AdminOrderFormTotalSection.total('Subtotal')}}" userInput="{{AdminOrderSimpleProductWithCatalogRule.subtotal}}" stepKey="seeOrderSubTotal"/>
         <waitForElementVisible selector="{{AdminOrderFormTotalSection.total('Shipping')}}" stepKey="waitOrderShippingToBeVisible"/>
         <see selector="{{AdminOrderFormTotalSection.total('Shipping')}}" userInput="{{AdminOrderSimpleProductWithCatalogRule.shipping}}" stepKey="seeOrderShipping"/>
         <waitForElementVisible selector="{{AdminOrderFormTotalSection.grandTotal}}" stepKey="waitOrderGrandTotalToBeVisible"/>
-        <see selector="{{AdminOrderFormTotalSection.grandTotal}}" userInput="{{AdminOrderSimpleProductWithCatalogRule.grandTotal}}" stepKey="seeCorrectGrandTotal"/>
+        <waitForText selector="{{AdminOrderFormTotalSection.grandTotal}}" userInput="{{AdminOrderSimpleProductWithCatalogRule.grandTotal}}" stepKey="seeCorrectGrandTotal"/>
     </test>
 </tests>