Skip to content

Commit 6ce7b42

Browse files
nikhilsharma-adobenikhilsharma-adobe
committed
Merge branch 'ACQE-4780_1' into ACQE-6354_mainline_PR_deployment
2 parents 6e7a4b9 + 819c9a8 commit 6ce7b42

6 files changed

+202
-0
lines changed

‎app/code/Magento/Multishipping/Test/Mftf/ActionGroup/StorefrontAddNewAddressActionGroup.xml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
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="StorefrontAddNewAddressActionGroup">
12+
<annotations>
13+
<description>On Storefront go to new address details page</description>
14+
</annotations>
15+
16+
<waitForElementClickable selector="{{StorefrontCustomerAddressesSection.addNewAddress}}" stepKey="waitForAddAddressButtonToBeClickable"/>
17+
<click selector="{{StorefrontCustomerAddressesSection.addNewAddress}}" stepKey="clickOnAddNewAddressButton"/>
18+
<waitForPageLoad stepKey="waitForAddressDetailsPageToBeOpen"/>
19+
</actionGroup>
20+
</actionGroups>

‎app/code/Magento/Multishipping/Test/Mftf/ActionGroup/StorefrontMultiShippingBillingOrderPageActionGroup.xml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
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="StorefrontMultiShippingBillingOrderPageActionGroup">
12+
<annotations>
13+
<description>On Storefront go to billing order page</description>
14+
</annotations>
15+
16+
<waitForElementClickable selector="{{StorefrontMultishippingCheckoutShippingToolbarSection.continueToBilling}}" stepKey="waitForContinueToBillingToBeClickable" />
17+
<click selector="{{StorefrontMultishippingCheckoutShippingToolbarSection.continueToBilling}}" stepKey="clickContinueToBilling"/>
18+
<waitForPageLoad stepKey="waitForCheckoutShippingToolbarPageLoad"/>
19+
</actionGroup>
20+
</actionGroups>

‎app/code/Magento/Multishipping/Test/Mftf/ActionGroup/StorefrontMultiShippingReviewOrderPageActionGroup.xml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
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="StorefrontMultiShippingReviewOrderPageActionGroup">
12+
<annotations>
13+
<description>On Storefront go to review order page</description>
14+
</annotations>
15+
16+
<waitForElementClickable selector="{{StorefrontMultishippingCheckoutBillingToolbarSection.goToReviewOrder}}" stepKey="waitForElementgoToReviewOrder"/>
17+
<click selector="{{StorefrontMultishippingCheckoutBillingToolbarSection.goToReviewOrder}}" stepKey="clickGoToReviewOrder"/>
18+
<waitForPageLoad stepKey="waitForReviewPageToBeOpen"/>
19+
</actionGroup>
20+
</actionGroups>

‎app/code/Magento/Multishipping/Test/Mftf/ActionGroup/StorefrontMultiShippingShippingOrderPageActionGroup.xml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
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="StorefrontMultiShippingShippingOrderPageActionGroup">
12+
<annotations>
13+
<description>On Storefront go to Shipping order page</description>
14+
</annotations>
15+
16+
<waitForElementClickable selector="{{StorefrontMultishippingCheckoutAddressesToolbarSection.goToShippingInformation}}" stepKey="waitForGoToShippingToBeClickable" />
17+
<click selector="{{StorefrontMultishippingCheckoutAddressesToolbarSection.goToShippingInformation}}" stepKey="clickGoToShippingInformation"/>
18+
<waitForPageLoad stepKey="waitForCheckoutAddressToolbarPageLoad"/>
19+
</actionGroup>
20+
</actionGroups>

‎app/code/Magento/Multishipping/Test/Mftf/ActionGroup/StorefrontSelectMultiShippingCheckMoneyOrderPaymentMethodActionGroup.xml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
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="StorefrontSelectMultiShippingCheckMoneyOrderPaymentMethodActionGroup">
12+
<annotations>
13+
<description>On Storefront select check money order opayment</description>
14+
</annotations>
15+
16+
<waitForElementClickable selector="{{StorefrontMultishippingCheckoutAddressesToolbarSection.checkmoneyorder}}" stepKey="CheckMoney"/>
17+
<click selector="{{StorefrontMultishippingCheckoutAddressesToolbarSection.checkmoneyorder}}" stepKey="selectCheckMoneyPaymentMethod"/>
18+
<waitForPageLoad stepKey="waitForReviewOrderPageToBeOpen"/>
19+
</actionGroup>
20+
</actionGroups>

‎app/code/Magento/Multishipping/Test/Mftf/Test/StorefrontLoggedInCustomerOrderedAllQtyOfSimpleProductFromTestSourceUsingMultiShipmentsTest.xml

Lines changed: 102 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,102 @@
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="StorefrontLoggedInCustomerOrderedAllQtyOfSimpleProductFromTestSourceUsingMultiShipmentsTest">
12+
<annotations>
13+
<stories value="Logged in customer ordered all qty of Simple product from Test source using multi-shipments"/>
14+
<title value="Logged in customer ordered all qty of Simple product from Test source using multi-shipments"/>
15+
<description value="Logged in customer ordered all qty of Simple product from Test source using multi-shipments."/>
16+
<testCaseId value="https://studio.cucumber.io/projects/69435/test-plan/folders/419534/scenarios/3688106"/>
17+
<severity value="CRITICAL"/>
18+
<group value="msi"/>
19+
<group value="multi_mode"/>
20+
</annotations>
21+
<before>
22+
<!-- Create customer -->
23+
<createData entity="Simple_US_Customer" stepKey="createCustomer"/>
24+
</before>
25+
<after>
26+
<deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
27+
</after>
28+
<!-- Login as a customer -->
29+
<actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginToStorefrontAccount" after="saveSimpleProduct">
30+
<argument name="Customer" value="$createCustomer$"/>
31+
</actionGroup>
32+
<!-- Open AddressBook and set Country -->
33+
<actionGroup ref="StorefrontCustomerGoToSidebarMenu" stepKey="goToAddressBookPage">
34+
<argument name="menu" value="Address Book"/>
35+
</actionGroup>
36+
<actionGroup ref="StorefrontAddNewAddressActionGroup" stepKey="goToAddressDetailsPageToCreateUSAddress"/>
37+
<!-- Fill all required address fields -->
38+
<actionGroup ref="FillNewCustomerAddressRequiredFieldsActionGroup" stepKey="fillUSAddressFields">
39+
<argument name="address" value="US_Address_California"/>
40+
</actionGroup>
41+
<!-- Save new address -->
42+
<actionGroup ref="StorefrontSaveCustomerAddressActionGroup" stepKey="saveUSAddress"/>
43+
<actionGroup ref="StorefrontAddNewAddressActionGroup" stepKey="goToAddressDetailsPageToCreateUKAddress"/>
44+
<!-- Fill all required address fields -->
45+
<actionGroup ref="FillNewCustomerAddressRequiredFieldsActionGroup" stepKey="fillUKAddressFields">
46+
<argument name="address" value="CustomerUKAddress"/>
47+
</actionGroup>
48+
<!-- Save new address -->
49+
<actionGroup ref="StorefrontSaveCustomerAddressActionGroup" stepKey="saveUKAddress"/>
50+
<actionGroup ref="StorefrontAddNewAddressActionGroup" stepKey="goToAddressDetailsPageToCreatePolandAddress"/>
51+
<!-- Fill all required address fields -->
52+
<actionGroup ref="FillNewCustomerAddressRequiredFieldsActionGroup" stepKey="fillTXAddressFields">
53+
<argument name="address" value="US_Address_TX"/>
54+
</actionGroup>
55+
<!-- Save new address -->
56+
<actionGroup ref="StorefrontSaveCustomerAddressActionGroup" stepKey="saveTXAddress"/>
57+
<!--Goto storefront add the product -->
58+
<actionGroup ref="StorefrontAddSimpleProductWithQtyActionGroup" stepKey="addSimpleProductToCart">
59+
<argument name="product" value="$$$createSimpleProduct$$"/>
60+
</actionGroup>
61+
<actionGroup ref="StorefrontCartPageOpenActionGroup" stepKey="gotoCart"/>
62+
<actionGroup ref="StorefrontCheckoutWithMultipleAddressesActionGroup" stepKey="checkoutWithMultipleAddresses"/>
63+
<!-- Select different addresses and click 'Go to Shipping Information' -->
64+
<actionGroup ref="StorefrontSelectAddressActionGroup" stepKey="selectUSAddres">
65+
<argument name="sequenceNumber" value="1"/>
66+
<argument name="option" value="John Doe, 6161 West Centinela Avenue, Culver City, California 90230, United States"/>
67+
</actionGroup>
68+
<actionGroup ref="StorefrontSelectAddressActionGroup" stepKey="selectUKAddress">
69+
<argument name="sequenceNumber" value="2"/>
70+
<argument name="option" value="Jane Miller, 1 London Bridge Street, London, SE12 9GF, United Kingdom"/>
71+
</actionGroup>
72+
<actionGroup ref="StorefrontSelectAddressActionGroup" stepKey="selecAustinAddress">
73+
<argument name="sequenceNumber" value="3"/>
74+
<argument name="option" value="John Doe, 7700 West Parmer Lane, Austin, Texas 78729, United States"/>
75+
</actionGroup>
76+
<!-- Click Go to Shipping Information* -->
77+
<actionGroup ref="StorefrontMultiShippingShippingOrderPageActionGroup" stepKey="goToShippingOrderPage"/>
78+
<actionGroup ref="StorefrontMultiShippingBillingOrderPageActionGroup" stepKey="goToBilling"/>
79+
<!-- Page contains Payment Method -->
80+
<actionGroup ref="StorefrontSelectMultiShippingCheckMoneyOrderPaymentMethodActionGroup" stepKey="selectCheckMoneyOrderPayment"/>
81+
<actionGroup ref="StorefrontMultiShippingReviewOrderPageActionGroup" stepKey="goToReviewOrder"/>
82+
<!--Click on Place Order"-->
83+
<actionGroup ref="PlaceOrderActionGroup" stepKey="placeOrder"/>
84+
<!--Check Thank you for your purchase!" page is opened -->
85+
<waitForText selector="{{StorefrontMultipleShippingMethodSection.successMessage}}" userInput="Successfully ordered" stepKey="seeSuccessMessage"/>
86+
<!--Grab all Order IDs -->
87+
<waitForElementVisible selector="{{StorefrontMultipleShippingMethodSection.orderId('1')}}" stepKey="waitForFirstOrderIdToBeVisible"/>
88+
<grabTextFrom selector="{{StorefrontMultipleShippingMethodSection.orderId('1')}}" stepKey="grabFirstOrderId"/>
89+
<grabTextFrom selector="{{StorefrontMultipleShippingMethodSection.orderId('2')}}" stepKey="grabSecondOrderId"/>
90+
<grabTextFrom selector="{{StorefrontMultipleShippingMethodSection.orderId('3')}}" stepKey="grabThirdOrderId"/>
91+
<!-- Go to admin and check order status -->
92+
<actionGroup ref="AdminOrdersPageOpenActionGroup" stepKey="navigateToSalesOrderPage"/>
93+
<actionGroup ref="SearchAdminDataGridByKeywordActionGroup" stepKey="searchForFirstOrder">
94+
<argument name="keyword" value="{$grabFirstOrderId}"/>
95+
</actionGroup>
96+
<actionGroup ref="AdminOrderGridClickFirstRowActionGroup" stepKey="clickOrderRow"/>
97+
<!--Verify that Created order is in Pending status-->
98+
<waitForText selector="{{AdminShipmentOrderInformationSection.orderStatus({$grabFirstOrderId})}}" userInput="Pending" stepKey="seeFirstOrderStatus"/>
99+
<waitForText selector="{{AdminShipmentOrderInformationSection.orderStatus({$grabSecondOrderId})}}" userInput="Pending" stepKey="seeSecondOrderStatus"/>
100+
<waitForText selector="{{AdminShipmentOrderInformationSection.orderStatus({$grabThirdOrderId})}}" userInput="Pending" stepKey="seeThirdOrderStatus"/>
101+
</test>
102+
</tests>

0 commit comments

Comments
 (0)