Skip to content

Commit e824e5b

Browse files
Karishmathakare19Karishmathakare19
committed
ACQE-8428: [MFTF TESTS] AdminLoginAsCustomerMultishippingLoggingTest
- Refactored the test case because the elements and AG used were outdated and no longer compatible with the current Magento execution. - Removed skip tag
1 parent bd4aabb commit e824e5b

8 files changed

+51
-34
lines changed

‎app/code/Magento/Checkout/Test/Mftf/ActionGroup/CheckoutSelectCheckMoneyOrderPaymentActionGroup.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
<waitForPageLoad stepKey="waitForLoadingMask"/>
1717
<waitForPageLoad stepKey="waitForPageLoad"/>
18-
<conditionalClick selector="{{StorefrontCheckoutPaymentMethodSection.checkPaymentMethodByName('Check / Money order')}}" dependentSelector="{{StorefrontCheckoutPaymentMethodSection.checkPaymentMethodByName('Check / Money order')}}" visible="true" stepKey="selectCheckmoPaymentMethod"/>
18+
<conditionalClick selector="{{StorefrontCheckoutPaymentMethodSection.paymentMethod('Check / Money order')}}" dependentSelector="{{StorefrontCheckoutPaymentMethodSection.paymentMethod('Check / Money order')}}" visible="true" stepKey="selectCheckmoPaymentMethod"/>
1919
<waitForPageLoad stepKey="waitForLoadingMaskAfterPaymentMethodSelection"/>
2020
</actionGroup>
2121
</actionGroups>

‎app/code/Magento/Checkout/Test/Mftf/Section/StorefrontCheckoutPaymentMethodSection.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,6 @@
1919
<element name="purchaseOrderNumber" type="input" selector="#po_number"/>
2020
<element name="checkPaypalExpress" type="radio" selector="//div/input[@id='paypal_express']"/>
2121
<element name="checkPaypalExpressActive" type="radio" selector="//div[@class='payment-method _active']/div/input[@id='paypal_express']"/>
22+
<element name="paymentMethod" type="radio" selector="//dl[@class='checkout-payment-method']//label[contains(., '{{methodName}}')]/../..//input" parameterized="true"/>
2223
</section>
2324
</sections>

‎app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerOrderSection.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,6 @@
2424
<element name="perPage" type="select" selector="//*[@class='order-products-toolbar toolbar bottom']//select[@id='limiter']"/>
2525
<element name="rowsInColumn" type="text" selector="//tbody/tr/td[contains(@class, '{{column}}')]" parameterized="true"/>
2626
<element name="viewOrderByOrderID" type="button" selector="//td[@data-th='Order #' and contains(text(), '{{orderID}}')]/following-sibling::td[@data-th='Actions']//a[contains(@class, 'action view')]//span" parameterized="true"/>
27+
<element name="orderComments" type="text" selector="//div[@class='block block-order-details-comments']//dl[@class='order-comments']//dd"/>
2728
</section>
2829
</sections>

‎app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminAssertContainsMessageOrderCreatedByAdminActionGroup.xml‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
6-
*/
3+
/**
4+
* Copyright 2020 Adobe
5+
* All Rights Reserved.
6+
*/
77
-->
88

99
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -20,7 +20,8 @@
2020

2121
<amOnPage url="{{AdminOrderPage.url(orderId)}}" stepKey="gotoOrderPage"/>
2222
<waitForPageLoad stepKey="waitForPageLoad"/>
23-
<see userInput="Order Placed by {{adminUserFullName}} using Login as Customer"
23+
<scrollTo selector="{{AdminOrderDetailsInformationSection.orderNote}}" stepKey="scrollToOrderComments"/>
24+
<waitForText selector="{{AdminOrderDetailsInformationSection.orderNote}}" userInput="Order Placed by {{adminUserFullName}} using Login as Customer"
2425
stepKey="seeMessageOrderCreatedByAdmin"/>
2526
</actionGroup>
2627
</actionGroups>

‎app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/StorefrontAssertContainsMessageOrderCreatedByAdminActionGroup.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
6-
*/
3+
/**
4+
* Copyright 2020 Adobe
5+
* All Rights Reserved.
6+
*/
77
-->
88

99
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -19,6 +19,6 @@
1919

2020
<amOnPage url="{{StorefrontCustomerOrderViewPage.url(orderId)}}" stepKey="gotoOrderPage"/>
2121
<waitForPageLoad stepKey="waitForPageLoad"/>
22-
<see userInput="Order Placed by Store Administrator" stepKey="seeMessageOrderCreatedByAdmin"/>
22+
<waitForText selector="{{StorefrontCustomerOrderSection.orderComments}}" userInput="Order Placed by Store Administrator" stepKey="seeMessageOrderCreatedByAdmin"/>
2323
</actionGroup>
2424
</actionGroups>

‎app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerMultishippingLoggingTest.xml‎

Lines changed: 31 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
6-
*/
3+
/**
4+
* Copyright 2020 Adobe
5+
* All Rights Reserved.
6+
*/
77
-->
88

99
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -17,10 +17,6 @@
1717
<severity value="MAJOR"/>
1818
<group value="login_as_customer"/>
1919
<group value="multishipping"/>
20-
<skip>
21-
<issueId value="https://github.com/magento/magento2-login-as-customer/pull/192"/>
22-
</skip>
23-
<group value="pr_exclude"/>
2420
</annotations>
2521

2622
<before>
@@ -34,7 +30,7 @@
3430
<comment userInput="Adding the comment to replace 'cache:flush' command for preserving Backward Compatibility" stepKey="flushCacheBeforeTestRun"/>
3531
<createData entity="SimpleProduct2" stepKey="createProduct1"/>
3632
<createData entity="SimpleProduct2" stepKey="createProduct2"/>
37-
<createData entity="Simple_US_Customer_Assistance_Allowed_Two_Addresses" stepKey="createCustomer"/>
33+
<createData entity="Simple_US_Customer_Multiple_Addresses" stepKey="createCustomer"/>
3834
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
3935
</before>
4036

@@ -48,7 +44,17 @@
4844
<actionGroup ref="CliDisableFreeShippingMethodActionGroup" stepKey="disableFreeShipping"/>
4945
<comment userInput="Adding the comment to replace 'cache:flush' command for preserving Backward Compatibility" stepKey="flushCacheAfterTestRun"/>
5046
</after>
51-
47+
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="runCronReindex">
48+
<argument name="indices" value=""/>
49+
</actionGroup>
50+
<!--Go to All Customers Page to open the customer-->
51+
<amOnPage url="{{AdminCustomerPage.url}}" stepKey="goToAllCustomersPage2"/>
52+
<actionGroup ref="OpenEditCustomerFromAdminActionGroup" stepKey="OpenEditCustomerFrom2">
53+
<argument name="customer" value="$$createCustomer$$"/>
54+
</actionGroup>
55+
<actionGroup ref="AdminOpenAccountInformationTabFromCustomerEditPageAllowAssistanceActionGroup" stepKey="clickOnAllowAssistanceConfig2"/>
56+
<!--Verify that changes are saved successfully-->
57+
<actionGroup ref="AdminSaveCustomerAndAssertSuccessMessage" stepKey="assertThatChangesAreSavedSuccessfully2"/>
5258
<!-- Login as Customer from Customer page -->
5359
<actionGroup ref="AdminLoginAsCustomerLoginFromCustomerPageActionGroup"
5460
stepKey="loginAsCustomerFromCustomerPage">
@@ -83,21 +89,27 @@
8389
</actionGroup>
8490
<waitForPageLoad stepKey="waitForOrderPageLoad"/>
8591

86-
<!-- Assert Storefront Order page contains message about Order created by a Store Administrator -->
87-
<actionGroup ref="StorefrontAssertContainsMessageOrderCreatedByAdminActionGroup" stepKey="verifyStorefrontMessageFirstOrder">
88-
<argument name="orderId" value="{$getFirstOrderIdPlaceOrder}"/>
89-
</actionGroup>
90-
<actionGroup ref="StorefrontAssertContainsMessageOrderCreatedByAdminActionGroup" stepKey="verifyStorefrontMessageSecondOrder">
91-
<argument name="orderId" value="{$getSecondOrderIdPlaceOrder}"/>
92-
</actionGroup>
92+
<!-- Assert Storefront First Order page contains message about Order created by a Store Administrator -->
93+
<actionGroup ref="StorefrontNavigateToCustomerOrdersHistoryPageActionGroup" stepKey="goToOrderHistoryPage"/>
94+
<click selector="{{OrdersGridSection.viewOrder({$getFirstOrderIdPlaceOrder})}}" stepKey="verifyStorefrontMessageFirstOrder"/>
95+
<waitForPageLoad stepKey="waitForPageLoad1"/>
96+
<grabFromCurrentUrl regex="~/order_id/(\d+)/~" stepKey="grabFirstOrderId"/>
97+
<waitForText selector="{{StorefrontCustomerOrderSection.orderComments}}" userInput="Order Placed by Store Administrator" stepKey="seeMessageOrderCreatedByAdmin"/>
98+
99+
<!-- Assert Storefront Second Order page contains message about Order created by a Store Administrator -->
100+
<actionGroup ref="StorefrontNavigateToCustomerOrdersHistoryPageActionGroup" stepKey="goToOrderHistoryPage2"/>
101+
<click selector="{{OrdersGridSection.viewOrder({$getSecondOrderIdPlaceOrder})}}" stepKey="verifyStorefrontMessageSecondOrder"/>
102+
<waitForPageLoad stepKey="waitForPageLoad2"/>
103+
<grabFromCurrentUrl regex="~/order_id/(\d+)/~" stepKey="grabSecondOrderId"/>
104+
<waitForText selector="{{StorefrontCustomerOrderSection.orderComments}}" userInput="Order Placed by Store Administrator" stepKey="seeMessageOrderCreatedByAdmin2"/>
93105

94106
<!-- Assert Admin Order page contains message about Order created by a Store Administrator -->
95107
<actionGroup ref="AdminAssertContainsMessageOrderCreatedByAdminActionGroup" stepKey="verifyAdminMessageFirstOrder">
96-
<argument name="orderId" value="{$getFirstOrderIdPlaceOrder}"/>
108+
<argument name="orderId" value="{$grabFirstOrderId}"/>
97109
<argument name="adminUserFullName" value="Magento User"/>
98110
</actionGroup>
99111
<actionGroup ref="AdminAssertContainsMessageOrderCreatedByAdminActionGroup" stepKey="verifyAdminMessageSecondOrder">
100-
<argument name="orderId" value="{$getSecondOrderIdPlaceOrder}"/>
112+
<argument name="orderId" value="{$grabSecondOrderId}"/>
101113
<argument name="adminUserFullName" value="Magento User"/>
102114
</actionGroup>
103115
</test>

‎app/code/Magento/Sales/Test/Mftf/Section/AdminOrderDetailsInformationSection.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,6 @@
3030
<element name="rateValue" type="text" selector="//table[contains(@class, 'order-information-table')]//th[contains(text(), 'rate:')]/following-sibling::td"/>
3131
<element name="historyStatus" type="button" selector="//select[@name='history[status]']"/>
3232
<element name="statusUpdate" type="button" selector="//button[@title='Update']"/>
33+
<element name="orderNote" type="block" selector="//div[@id='order_history_block']//ul[@class='note-list']"/>
3334
</section>
3435
</sections>

‎app/code/Magento/Sales/Test/Mftf/Section/OrdersGridSection.xml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
6-
*/
3+
/**
4+
* Copyright 2017 Adobe
5+
* All Rights Reserved.
6+
*/
77
-->
88

99
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -37,5 +37,6 @@
3737
<element name="displayedProducts" type="text" selector="//input[@class='checkbox admin__control-checkbox']/../../..//td[contains(@class,'col-sku') and contains(text(),'test')]"/>
3838
<element name="pageNumber" type="input" selector="//input[@id='sales_order_create_search_grid_page-current' and @value='{{page_index}}']" parameterized="true"/>
3939
<element name="grandTotal" type="text" selector="//div[@data-role='grid-wrapper']//tr//td[contains(.,'{{value}}')]" parameterized="true"/>
40+
<element name="viewOrder" type="button" selector="//table[@id='my-orders-table']//tbody//tr[td[contains(@class,'col id') and contains(text(),'{{orderNumber}}')]]//a[@class='action view']" parameterized="true"/>
4041
</section>
4142
</sections>

0 commit comments

Comments
 (0)