Skip to content

Commit 13a41e0

Browse files
nikhilsharma-adobenikhilsharma-adobe
committed
Merge branch 'ACQE-6633' into ACQE-6779_mainline_PR_deployment
2 parents ef8da16 + cc50dda commit 13a41e0

File tree

3 files changed

+102
-0
lines changed

3 files changed

+102
-0
lines changed

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,4 +53,13 @@
5353
<data key="checkboxText" unique="suffix">test_checkbox</data>
5454
<data key="content" unique="suffix">TestMessage</data>
5555
</entity>
56+
<entity name="termAndCondition" type="term">
57+
<data key="name" unique="suffix">Test Condition</data>
58+
<data key="isActive">Enabled</data>
59+
<data key="isHtml">Text</data>
60+
<data key="mode">Automatically</data>
61+
<data key="storeView">All Store Views</data>
62+
<data key="checkboxText" unique="suffix">Terms and Conditions</data>
63+
<data key="content" unique="suffix">TestMessage</data>
64+
</entity>
5665
</entities>

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,7 @@
1313
<element name="checkoutAgreementButton" type="button" selector="div.checkout-agreements-block > div > div > div > label > button > span"/>
1414
<element name="checkoutAgreementErrorMessage" type="button" selector="div.checkout-agreement.field.choice.required > div.mage-error"/>
1515
<element name="checkoutAgreementCheckboxcheck" type="checkbox" selector="//span[text()='{{agreementname}}']/../../../input[@type='checkbox']" parameterized="true"/>
16+
<element name="checkoutAgreementLink" type="button" selector="//div[@id='checkout-payment-method-load']//label//span[contains(., '{{paymentName}}')]//ancestor::div[contains(@class, 'payment-method _active')]//div[contains(@class, 'checkout-agreements-block')]//span" parameterized="true"/>
17+
<element name="agreementClose" type="button" selector=".agreements-modal._show .action-close"/>
1618
</section>
1719
</sections>

‎app/code/Magento/CheckoutAgreements/Test/Mftf/Test/StorefrontCheckTermsAndConditionIsPresentInPaymentPageTest.xml

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
10+
<test name="StorefrontCheckTermsAndConditionIsPresentInPaymentPageTest">
11+
<annotations>
12+
<features value="CheckoutAgreements"/>
13+
<stories value="Check terms and condition options in payment page"/>
14+
<title value="Terms and Conditions is presented on Storefront with Applied = Automatically"/>
15+
<description value="Enable terms and condition option in all payment sections when checkout options is added as automatically"/>
16+
<severity value="MAJOR"/>
17+
<testCaseId value="AC-4178"/>
18+
</annotations>
19+
<before>
20+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
21+
<!-- New Customer -->
22+
<createData entity="Simple_US_Customer" stepKey="createCustomer">
23+
<field key="firstname">John1</field>
24+
<field key="lastname">Doe1</field>
25+
</createData>
26+
<createData entity="SimpleProduct2" stepKey="simpleProduct">
27+
<field key="price">1</field>
28+
</createData>
29+
<!-- Enable Terms And Condition-->
30+
<magentoCLI command="config:set checkout/options/enable_agreements 1" stepKey="setEnableTermsOnCheckout"/>
31+
<!-- Open New Terms And Conditions Page-->
32+
<actionGroup ref="AdminTermsConditionsOpenNewTermPageActionGroup" stepKey="openNewTerm"/>
33+
<!-- Fill the Required Details-->
34+
<actionGroup ref="AdminTermsConditionsFillTermEditFormActionGroup" stepKey="fillNewTerm">
35+
<argument name="term" value="termAndCondition"/>
36+
</actionGroup>
37+
<grabTextFrom selector="{{AdminNewTermFormSection.conditionName}}" stepKey="conditionName"/>
38+
<!-- Save Details-->
39+
<actionGroup ref="AdminTermsConditionsSaveTermActionGroup" stepKey="saveFilledTerm"/>
40+
<!--Enable Cash On Delivery Method -->
41+
<magentoCLI command="config:set {{CashOnDeliveryEnableConfigData.path}} {{CashOnDeliveryEnableConfigData.value}}" stepKey="enableCashOnDelivery"/>
42+
</before>
43+
<after>
44+
<magentoCLI command="config:set checkout/options/enable_agreements 0" stepKey="setDisableTermsOnCheckout"/>
45+
<magentoCLI command="config:set {{CashOnDeliveryDisabledConfigData.path}} {{CashOnDeliveryDisabledConfigData.value}}" stepKey="disabledCashOnDelivery"/>
46+
<actionGroup ref="AdminTermsConditionsOpenGridActionGroup" stepKey="openTermsGridToDelete"/>
47+
<actionGroup ref="AdminDeleteAllTermConditionsActionGroup" stepKey="deleteAllTerms"/>
48+
<actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer" />
49+
<deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
50+
<deleteData createDataKey="simpleProduct" stepKey="deleteSimpleProduct"/>
51+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
52+
</after>
53+
<actionGroup ref="LoginToStorefrontActionGroup" stepKey="signUpNewUser">
54+
<argument name="Customer" value="$$createCustomer$$"/>
55+
</actionGroup>
56+
<actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanInvalidatedCaches">
57+
<argument name="tags" value="config full_page"/>
58+
</actionGroup>
59+
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindexInvalidatedIndices">
60+
<argument name="indices" value=""/>
61+
</actionGroup>
62+
<actionGroup ref="AddSimpleProductToCartActionGroup" stepKey="addSimpleProductToCart">
63+
<argument name="product" value="$simpleProduct$"/>
64+
</actionGroup>
65+
<!--Go to Checkout-->
66+
<actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart"/>
67+
<waitForLoadingMaskToDisappear stepKey="waitForLoadingCheckoutPageWithShippingMethod"/>
68+
<actionGroup ref="StorefrontSelectFirstShippingMethodActionGroup" stepKey="selectFirstShippingMethod"/>
69+
<actionGroup ref="StorefrontCheckoutClickNextButtonActionGroup" stepKey="clickNext"/>
70+
<!-- Checkout select Check/Money Order payment -->
71+
<actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyPayment"/>
72+
<waitForElementClickable selector="{{StorefrontCheckoutAgreementsSection.checkoutAgreementLink('Check / Money order')}}" stepKey="waitForClickableForCheckAgreement"/>
73+
<click selector="{{StorefrontCheckoutAgreementsSection.checkoutAgreementLink('Check / Money order')}}" stepKey="clickOnMoneyAgreement"/>
74+
<waitForElementClickable selector="{{StorefrontCheckoutAgreementsSection.agreementClose}}" stepKey="waitForElementToCloseMoneyAgreement"/>
75+
<click selector="{{StorefrontCheckoutAgreementsSection.agreementClose}}" stepKey="closeMoneyAgreement"/>
76+
<!-- Select Cash On Delivery payment method Again-->
77+
<waitForElementClickable selector="{{StorefrontCheckoutPaymentMethodsSection.cashOnDelivery}}" stepKey="waitForClickableSelectCashOnDeliveryMethodAgain"/>
78+
<click selector="{{StorefrontCheckoutPaymentMethodsSection.cashOnDelivery}}" stepKey="selectCashOnDeliveryMethodAgain"/>
79+
<waitForElementClickable selector="{{StorefrontCheckoutAgreementsSection.checkoutAgreementLink('Cash On Delivery')}}" stepKey="waitForClickableForCashAgreement"/>
80+
<click selector="{{StorefrontCheckoutAgreementsSection.checkoutAgreementLink('Cash On Delivery')}}" stepKey="clickOnCashAgreement"/>
81+
<waitForElementClickable selector="{{StorefrontCheckoutAgreementsSection.agreementClose}}" stepKey="waitForElementToCloseCashAgreement"/>
82+
<click selector="{{StorefrontCheckoutAgreementsSection.agreementClose}}" stepKey="closeCashAgreement"/>
83+
<actionGroup ref="ClickPlaceOrderActionGroup" stepKey="checkoutPlaceOrder"/>
84+
<grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber22}}" stepKey="grabOrderNumber"/>
85+
<!--Check subtotal in created order-->
86+
<actionGroup ref="FilterOrderGridByIdActionGroup" stepKey="filterOrderById">
87+
<argument name="orderId" value="$grabOrderNumber"/>
88+
</actionGroup>
89+
<actionGroup ref="AdminOrderGridClickFirstRowActionGroup" stepKey="clickOrderRow"/>
90+
</test>
91+
</tests>

0 commit comments

Comments
 (0)