Skip to content

Commit adb6e71

Browse files
glo25731glo25731
committed
ACQE-6693:Set GiftMessage during OnePageCheckout with enabled ScalableCheckout
Added files
1 parent 2e08b17 commit adb6e71

6 files changed

+150
-0
lines changed

‎app/code/Magento/GiftMessage/Test/Mftf/ActionGroup/AssertAdminGiftMessageAtItemLevelActionGroup.xml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
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+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AssertAdminGiftMessageAtItemLevelActionGroup">
12+
<annotations>
13+
<description>Check that Gift Message at item level on admin side.</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="productName" type="string"/>
17+
<argument name="message" type="string"/>
18+
</arguments>
19+
<waitForElementClickable selector="{{AdminOrderGiftSection.orderItemGiftOptionsLink(productName)}}" stepKey="waitForGiftOptionsLinkToBePresent"/>
20+
<click selector="{{AdminOrderGiftSection.orderItemGiftOptionsLink(productName)}}" stepKey="clickOnGiftOptions"/>
21+
<scrollTo selector="{{AdminOrderGiftSection.giftMessageOrderSection}}" stepKey="scrollToGiftMessageSection"/>
22+
<seeInField userInput="July" selector="{{AdminOrderGiftSection.giftMessageFromNameAtItemLevel}}" stepKey="seeFromName"/>
23+
<seeInField userInput="Josh" selector="{{AdminOrderGiftSection.giftMessageToNameAtItemLevel}}" stepKey="seeToName"/>
24+
<seeInField userInput="{{message}}" selector="{{AdminOrderGiftSection.giftMessageAtItemLevel}}" stepKey="seeMessage"/>
25+
</actionGroup>
26+
</actionGroups>

‎app/code/Magento/GiftMessage/Test/Mftf/ActionGroup/AssertAdminGiftMessageAtOrderLevelActionGroup.xml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
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+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AssertAdminGiftMessageAtOrderLevelActionGroup">
12+
<annotations>
13+
<description>Check that Gift Message at order level on admin side.</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="message" type="string"/>
17+
</arguments>
18+
<scrollTo selector="{{AdminOrderGiftSection.giftMessageOrderSection}}" stepKey="scrollToGiftMessageSection"/>
19+
<seeInField userInput="July" selector="{{AdminOrderGiftSection.giftMessageFromName}}" stepKey="seeFromName"/>
20+
<seeInField userInput="Josh" selector="{{AdminOrderGiftSection.giftMessageToName}}" stepKey="seeToName"/>
21+
<seeInField userInput="{{message}}" selector="{{AdminOrderGiftSection.giftMessageMessage}}" stepKey="seeMessage"/>
22+
</actionGroup>
23+
</actionGroups>

‎app/code/Magento/GiftMessage/Test/Mftf/Section/AdminOrderGiftSection.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,8 @@
1515
<element name="giftMessageFromName" type="input" selector=".giftmessage-whole-order-container .admin__field:nth-of-type(1) input"/>
1616
<element name="giftMessageToName" type="input" selector=".giftmessage-whole-order-container .admin__field:nth-of-type(2) input"/>
1717
<element name="giftMessageMessage" type="input" selector=".giftmessage-whole-order-container .admin__field textarea"/>
18+
<element name="giftMessageFromNameAtItemLevel" type="input" selector="#current_item_giftmessage_sender"/>
19+
<element name="giftMessageToNameAtItemLevel" type="input" selector="#current_item_giftmessage_recipient"/>
20+
<element name="giftMessageAtItemLevel" type="input" selector="#current_item_giftmessage_message"/>
1821
</section>
1922
</sections>

‎app/code/Magento/GiftMessage/Test/Mftf/Section/StorefrontFillGiftMessageAtOrderLevelActionGroup.xml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
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+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="StorefrontFillGiftMessageAtOrderLevelActionGroup">
12+
<annotations>
13+
<description>Fill gift messages at order level.</description>
14+
</annotations>
15+
<waitForElementClickable selector="{{StorefrontOrderGiftSection.giftMessageTitle}}" stepKey="waitToClickOnGiftOptionsAtOrderLevel"/>
16+
<click selector="{{StorefrontOrderGiftSection.giftMessageTitle}}" stepKey="clickOnGiftOptionsAtOrderLevel"/>
17+
<waitForElementVisible selector="{{StorefrontOrderGiftSection.giftMessageTo}}" stepKey="waitTillToFieldIsVisible"/>
18+
<fillField selector="{{StorefrontOrderGiftSection.giftMessageTo}}" userInput="Josh" stepKey="fillToField"/>
19+
<waitForElementVisible selector="{{StorefrontOrderGiftSection.giftMessageFrom}}" stepKey="waitTillFromFieldIsVisible"/>
20+
<fillField selector="{{StorefrontOrderGiftSection.giftMessageFrom}}" userInput="July" stepKey="fillFromField"/>
21+
<waitForElementVisible selector="{{StorefrontOrderGiftSection.giftMessageMessage}}" stepKey="waitTillMessageFieldIsVisible"/>
22+
<fillField selector="{{StorefrontOrderGiftSection.giftMessageMessage}}" userInput="This is gift message for ALL ORDERED ITEMS" stepKey="fillMessageField"/>
23+
<waitForElementClickable selector="{{StorefrontOrderGiftSection.giftMessageUpdateButton}}" stepKey="waitForUpdateButton"/>
24+
<click selector="{{StorefrontOrderGiftSection.giftMessageUpdateButton}}" stepKey="saveGiftMessage"/>
25+
<waitForPageLoad stepKey="waitForPageLoaded" />
26+
<scrollTo selector="{{StorefrontOrderGiftSection.giftMessageSummary}}" stepKey="scrollToGiftMessage"/>
27+
<see selector="{{StorefrontOrderGiftSection.giftMessageSummary}}" userInput="This is gift message for ALL ORDERED ITEMS" stepKey="seeGiftMessage"/>
28+
</actionGroup>
29+
</actionGroups>

‎app/code/Magento/GiftMessage/Test/Mftf/Section/StorefrontOrderGiftSection.xml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,16 @@
2020
<element name="giftMessageTextField" type="input" selector=".gift-options-content .text textarea"/>
2121
<element name="giftMessageSummary" type="text" selector=".gift-message-summary"/>
2222
<element name="giftMessageUpdateButton" type="button" selector="button.action-update"/>
23+
<element name="giftOptionsItemLevel" type="text" selector=".gift-options-cart-item .action-gift"/>
24+
<element name="giftOptionsEditAtItemLevel" type="text" selector=".actions-toolbar> .action-edit"/>
25+
<element name="giftOptionsDeleteAtItemLevel" type="text" selector=".actions-toolbar> .action-delete"/>
26+
<element name="giftMessageTo" type="input" selector="#gift-message-whole-to-giftOptionsCart"/>
27+
<element name="giftMessageFrom" type="input" selector="#gift-message-whole-from-giftOptionsCart"/>
28+
<element name="giftMessageMessage" type="input" selector="#gift-message-whole-message-giftOptionsCart"/>
29+
<element name="giftMessageUpdate" type="input" selector="(//*[@class='actions-toolbar']//button[@title='Update']/span)[2]"/>
30+
<element name="giftOptionsEditAtOrderLevel" type="text" selector=".cart-gift-item .content .actions-toolbar .action-edit"/>
31+
<element name="giftOptionsDeleteAtOrderLevel" type="text" selector=".cart-gift-item .content .actions-toolbar .action-delete"/>
32+
<element name="giftMessageOnOrderLevel" type="text" selector=".cart-gift-item .content .gift-message-summary"/>
33+
<element name="giftMessageOnOrderLevelText" type="text" selector="//*[text()='This is gift message for ALL ORDERED ITEMS']"/>
2334
</section>
2435
</sections>

‎app/code/Magento/GiftMessage/Test/Mftf/Test/AdminSetGiftMessageDuringOnePageCheckoutWithEnabledScalableCheckoutTest.xml

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
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+
9+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
11+
<test name="AdminSetGiftMessageDuringOnePageCheckoutWithEnabledScalableCheckoutTest" extends="StorefrontGiftMessageForOrderOnCheckoutCartPageTest">
12+
<annotations>
13+
<stories value="Gift Message for order present on checkout cart page."/>
14+
<title value="Admin Set GiftMessage during OnePageCheckout with enabled ScalableCheckout"/>
15+
<description value="Admin Set GiftMessage during OnePageCheckout with enabled ScalableCheckout and assert the gift message in order page"/>
16+
<severity value="MAJOR"/>
17+
<testCaseId value="AC-3953"/>
18+
</annotations>
19+
<before>
20+
<magentoCLI command="config:set sales/gift_options/allow_items 1" stepKey="allowGiftMessagesForOrderItems"/>
21+
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
22+
<argument name="indices" value=""/>
23+
</actionGroup>
24+
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
25+
<argument name="tags" value="config full_page"/>
26+
</actionGroup>
27+
</before>
28+
<after>
29+
<magentoCLI command="config:set sales/gift_options/allow_order 0" stepKey="disableGiftMessageForOrder"/>
30+
<actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="openOrdersGridAndClearFilters" />
31+
</after>
32+
<remove keyForRemoval="assertGiftMessageForAdminOrder"/>
33+
<!--See gift options link at item level and order level-->
34+
<waitForElement selector="{{StorefrontOrderGiftSection.giftOptionsItemLevel}}" before="seeGiftMessageFields" stepKey="seeGiftOptionsItemLevel"/>
35+
<waitForElement selector="{{StorefrontOrderGiftSection.giftMessageTitle}}" after="seeGiftOptionsItemLevel" stepKey="seeGiftOptionsOrderLevel"/>
36+
<!--Click on gift options at item level and fill gift message-->
37+
<waitForElementClickable selector="{{StorefrontOrderGiftSection.giftOptionsItemLevel}}" after="seeGiftOptionsOrderLevel" stepKey="waitForGiftOptionsAtItemLevel"/>
38+
<click selector="{{StorefrontOrderGiftSection.giftOptionsItemLevel}}" after="waitForGiftOptionsAtItemLevel" stepKey="clickOnGiftOptionsAtItemLevel"/>
39+
<!--Assert Edit and Delete icons at item level-->
40+
<waitForElement selector="{{StorefrontOrderGiftSection.giftOptionsEditAtItemLevel}}" before="fillGiftMessageFields" stepKey="assertEditIconAtItemLevel"/>
41+
<waitForElement selector="{{StorefrontOrderGiftSection.giftOptionsDeleteAtItemLevel}}" after="assertEditIconAtItemLevel" stepKey="assertDeleteIconAtItemLevel"/>
42+
<!--Fill Gift message at order level-->
43+
<actionGroup ref="StorefrontFillGiftMessageAtOrderLevelActionGroup" before="navigateToCheckoutPage" stepKey="fillGiftMessageAtOrderLevel"/>
44+
<!--Assert Edit and Delete icons at order level-->
45+
<waitForElement selector="{{StorefrontOrderGiftSection.giftOptionsEditAtOrderLevel}}" after="fillGiftMessageAtOrderLevel" stepKey="assertEditIconAtOrderLevel"/>
46+
<waitForElement selector="{{StorefrontOrderGiftSection.giftOptionsDeleteAtOrderLevel}}" after="assertEditIconAtOrderLevel" stepKey="assertDeleteIconAtOrderLevel"/>
47+
<!--Assert gift message at order level-->
48+
<actionGroup ref="AssertAdminGiftMessageAtOrderLevelActionGroup" after="filterOrdersGridById" stepKey="assertGiftMessageAtOrderLevelForAdminOrder">
49+
<argument name="message" value="This is gift message for ALL ORDERED ITEMS"/>
50+
</actionGroup>
51+
<!--Assert gift message at item level-->
52+
<actionGroup ref="AssertAdminGiftMessageAtItemLevelActionGroup" after="assertGiftMessageAtOrderLevelForAdminOrder" stepKey="assertGiftMessageAtItemLevelForAdminOrder">
53+
<argument name="productName" value="$$simpleProduct.name$$"/>
54+
<argument name="message" value="Best wishes!"/>
55+
</actionGroup>
56+
</test>
57+
</tests>
58+

0 commit comments

Comments
 (0)