Skip to content

Commit 088b26e

Browse files
Karishmathakare19Karishmathakare19
committed
Merge branch 'ACQE-8428' into ACQE-functional-deployment-v3-8
2 parents e981989 + 54b1dad commit 088b26e

9 files changed

+77
-38
lines changed

‎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: 55 additions & 22 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,8 +30,29 @@
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"/>
38-
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
33+
<createData entity="Simple_US_Customer_Multiple_Addresses" stepKey="createCustomer"/>
34+
<!-- Create new User -->
35+
<actionGroup ref="AdminLoginActionGroup" stepKey="adminLogin"/>
36+
<actionGroup ref="AdminCreateUserWithRoleActionGroup" stepKey="createAdminUser">
37+
<argument name="user" value="activeAdmin"/>
38+
<argument name="role" value="roleDefaultAdministrator"/>
39+
</actionGroup>
40+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutMasterAdmin"/>
41+
42+
<!-- Login as new User -->
43+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginToNewAdmin">
44+
<argument name="username" value="{{activeAdmin.username}}"/>
45+
<argument name="password" value="{{activeAdmin.password}}"/>
46+
</actionGroup>
47+
48+
<!--Go to All Customers Page to open the customer-->
49+
<amOnPage url="{{AdminCustomerPage.url}}" stepKey="goToAllCustomersPage2"/>
50+
<actionGroup ref="OpenEditCustomerFromAdminActionGroup" stepKey="OpenEditCustomerFrom2">
51+
<argument name="customer" value="$$createCustomer$$"/>
52+
</actionGroup>
53+
<actionGroup ref="AdminOpenAccountInformationTabFromCustomerEditPageAllowAssistanceActionGroup" stepKey="clickOnAllowAssistanceConfig2"/>
54+
<!--Verify that changes are saved successfully-->
55+
<actionGroup ref="AdminSaveCustomerAndAssertSuccessMessage" stepKey="assertThatChangesAreSavedSuccessfully2"/>
3956
</before>
4057

4158
<after>
@@ -44,6 +61,13 @@
4461
<actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer" />
4562
<deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
4663
<actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearAllOrdersGridFilters"/>
64+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
65+
66+
<!-- Delete new User -->
67+
<actionGroup ref="AdminLoginActionGroup" stepKey="adminLogin"/>
68+
<actionGroup ref="AdminDeleteUserActionGroup" stepKey="deleteUser">
69+
<argument name="user" value="activeAdmin"/>
70+
</actionGroup>
4771
<actionGroup ref="AdminLogoutActionGroup" stepKey="adminLogout"/>
4872
<actionGroup ref="CliDisableFreeShippingMethodActionGroup" stepKey="disableFreeShipping"/>
4973
<comment userInput="Adding the comment to replace 'cache:flush' command for preserving Backward Compatibility" stepKey="flushCacheAfterTestRun"/>
@@ -67,7 +91,10 @@
6791
<actionGroup ref="CheckingWithMultipleAddressesActionGroup" stepKey="checkoutWithMultipleAddresses"/>
6892
<waitForPageLoad stepKey="waitForShippingInfoPageLoad"/>
6993
<actionGroup ref="SelectMultiShippingInfoActionGroup" stepKey="checkoutWithMultipleShipping"/>
70-
<actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyPayment"/>
94+
<!-- Selects the 'Check / Money Order' Payment Method -->
95+
<waitForPageLoad stepKey="waitForPageLoad"/>
96+
<conditionalClick selector="{{StorefrontCheckoutPaymentMethodSection.paymentMethod('Check / Money order')}}" dependentSelector="{{StorefrontCheckoutPaymentMethodSection.paymentMethod('Check / Money order')}}" visible="true" stepKey="selectCheckmoPaymentMethod"/>
97+
<!-- Select Billing Info -->
7198
<actionGroup ref="SelectBillingInfoActionGroup" stepKey="checkoutWithPaymentMethod"/>
7299
<waitForPageLoad stepKey="waitForReviewOrderPageLoad"/>
73100
<actionGroup ref="ReviewOrderForMultiShipmentActionGroup" stepKey="reviewOrderForMultiShipment">
@@ -83,22 +110,28 @@
83110
</actionGroup>
84111
<waitForPageLoad stepKey="waitForOrderPageLoad"/>
85112

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>
113+
<!-- Assert Storefront First Order page contains message about Order created by a Store Administrator -->
114+
<actionGroup ref="StorefrontNavigateToCustomerOrdersHistoryPageActionGroup" stepKey="goToOrderHistoryPage"/>
115+
<click selector="{{OrdersGridSection.viewOrder({$getFirstOrderIdPlaceOrder})}}" stepKey="verifyStorefrontMessageFirstOrder"/>
116+
<waitForPageLoad stepKey="waitForPageLoad1"/>
117+
<grabFromCurrentUrl regex="~/order_id/(\d+)/~" stepKey="grabFirstOrderId"/>
118+
<waitForText selector="{{StorefrontCustomerOrderSection.orderComments}}" userInput="Order Placed by Store Administrator" stepKey="seeMessageOrderCreatedByAdmin"/>
119+
120+
<!-- Assert Storefront Second Order page contains message about Order created by a Store Administrator -->
121+
<actionGroup ref="StorefrontNavigateToCustomerOrdersHistoryPageActionGroup" stepKey="goToOrderHistoryPage2"/>
122+
<click selector="{{OrdersGridSection.viewOrder({$getSecondOrderIdPlaceOrder})}}" stepKey="verifyStorefrontMessageSecondOrder"/>
123+
<waitForPageLoad stepKey="waitForPageLoad2"/>
124+
<grabFromCurrentUrl regex="~/order_id/(\d+)/~" stepKey="grabSecondOrderId"/>
125+
<waitForText selector="{{StorefrontCustomerOrderSection.orderComments}}" userInput="Order Placed by Store Administrator" stepKey="seeMessageOrderCreatedByAdmin2"/>
93126

94127
<!-- Assert Admin Order page contains message about Order created by a Store Administrator -->
95128
<actionGroup ref="AdminAssertContainsMessageOrderCreatedByAdminActionGroup" stepKey="verifyAdminMessageFirstOrder">
96-
<argument name="orderId" value="{$getFirstOrderIdPlaceOrder}"/>
97-
<argument name="adminUserFullName" value="Magento User"/>
129+
<argument name="orderId" value="{$grabFirstOrderId}"/>
130+
<argument name="adminUserFullName" value="{{activeAdmin.firstname}} {{activeAdmin.lastname}}"/>
98131
</actionGroup>
99132
<actionGroup ref="AdminAssertContainsMessageOrderCreatedByAdminActionGroup" stepKey="verifyAdminMessageSecondOrder">
100-
<argument name="orderId" value="{$getSecondOrderIdPlaceOrder}"/>
101-
<argument name="adminUserFullName" value="Magento User"/>
133+
<argument name="orderId" value="{$grabSecondOrderId}"/>
134+
<argument name="adminUserFullName" value="{{activeAdmin.firstname}} {{activeAdmin.lastname}}"/>
102135
</actionGroup>
103136
</test>
104137
</tests>

‎app/code/Magento/LoginAsCustomer/Test/Mftf/test-dependency-allowlist‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@ SelectMultiShippingInfoActionGroup
77
SelectBillingInfoActionGroup
88
ReviewOrderForMultiShipmentActionGroup
99
StorefrontPlaceOrderForMultipleAddressesActionGroup
10+
AdminOpenAccountInformationTabFromCustomerEditPageAllowAssistanceActionGroup

‎app/code/Magento/LoginAsCustomer/Test/Mftf/test-dependency-errors-detailed‎

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

22
File "/var/www/html/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerMultishippingLoggingTest.xml"
33
contains entity references that violate dependency constraints:
4-
4+
55
CliEnableFreeShippingMethodActionGroup from module(s): magento/module-offline-shipping
66
CliEnableFlatRateShippingMethodActionGroup from module(s): magento/module-offline-shipping
77
CliEnableCheckMoneyOrderPaymentMethodActionGroup from module(s): magento/module-offline-payments

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
/**
4-
* Copyright 2018 Adobe.
4+
* Copyright 2018 Adobe
55
* All Rights Reserved.
66
*/
77
-->
@@ -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)