Skip to content

Commit ca841d3

Browse files
Karishmathakare19Karishmathakare19
committed
Merge branch 'ACQE-8291' into ACQE-functional-deployment-v7-1
2 parents f1d1721 + 446e5f3 commit ca841d3

File tree

6 files changed

+25
-73
lines changed

6 files changed

+25
-73
lines changed

‎app/code/Magento/Checkout/Test/Mftf/Test/CheckCheckoutSuccessPageTest/CheckCheckoutSuccessPageAsRegisterCustomerTest.xml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -137,14 +137,7 @@
137137

138138
<!-- See print page -->
139139
<click selector="{{CheckoutSuccessMainSection.printLink}}" stepKey="clickPrintLink"/>
140-
<helper class="Magento\Sales\Test\Mftf\Helper\SalesHelper" method="switchToWindowWithUrlAndClosePrintDialogIfEncountered" stepKey="switchToWindowWithUrlAndClosePrintDialogIfEncountered">
141-
<argument name="expectedUrl">sales/order/print/order_id/</argument>
142-
<argument name="expectedUrlComparisonType">COMPARISON_PATH_SUBSET_MATCH</argument>
143-
</helper>
144-
145-
<comment userInput="Step key preserved for backwards compatibility" stepKey="switchToWindow"/>
146-
<comment userInput="Step key preserved for backwards compatibility" stepKey="switchToTab"/>
147-
<comment userInput="Step key preserved for backwards compatibility" stepKey="seePrintPage"/>
140+
<waitForPageLoad stepKey="waitForPrintOrderPageLoad"/>
148141
<seeElement selector="{{StorefrontCustomerOrderViewSection.orderTitle}}" stepKey="seeOrderTitleOnPrint"/>
149142
<switchToWindow stepKey="switchToWindow2"/>
150143
</test>

‎app/code/Magento/Customer/Test/Mftf/Test/AdminPanelIsFrozenIfStorefrontIsOpenedViaCustomerViewTest.xml

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

@@ -27,7 +27,6 @@
2727
<createData entity="SimpleProduct" stepKey="createSimpleProduct">
2828
<requiredEntity createDataKey="createSimpleCategory"/>
2929
</createData>
30-
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="login"/>
3130
</before>
3231
<after>
3332
<!-- Disable shipping method for customer with default address -->
@@ -36,7 +35,6 @@
3635
<deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
3736
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
3837
</after>
39-
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="navigateToNewOrderPage"/>
4038
<createData entity="CustomerCart" stepKey="createCustomerCart">
4139
<requiredEntity createDataKey="simpleCustomer"/>
4240
</createData>
@@ -47,16 +45,12 @@
4745
<createData entity="CustomerAddressInformation" stepKey="fillCustomerInfo">
4846
<requiredEntity createDataKey="createCustomerCart"/>
4947
</createData>
50-
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="selectFlatRate"/>
5148
<updateData createDataKey="createCustomerCart" entity="CustomerOrderPaymentMethod" stepKey="submitOrder">
5249
<requiredEntity createDataKey="createCustomerCart"/>
5350
</updateData>
54-
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="getOrderId"/>
55-
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="startCreateInvoice"/>
5651
<createData entity="Invoice" stepKey="submitInvoice">
5752
<requiredEntity createDataKey="createCustomerCart"/>
5853
</createData>
59-
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="goToShipment"/>
6054
<createData entity="Shipment" stepKey="submitShipment">
6155
<requiredEntity createDataKey="createCustomerCart"/>
6256
</createData>
@@ -73,9 +67,6 @@
7367
</actionGroup>
7468
<actionGroup ref="StorefrontClickViewOrderLinkOnMyOrdersPageActionGroup" stepKey="clickViewOrder"/>
7569
<actionGroup ref="StorefrontClickPrintOrderLinkOnViewOrderPageActionGroup" stepKey="clickPrintOrderLink"/>
76-
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitPageReload"/>
77-
<switchToWindow stepKey="switchToWindow"/>
78-
<switchToPreviousTab stepKey="switchToPreviousTab"/>
7970
<actionGroup ref="StorefrontCustomerGoToSidebarMenu" stepKey="goToAddressBook">
8071
<argument name="menu" value="Address Book"/>
8172
</actionGroup>

‎app/code/Magento/Sales/Test/Mftf/ActionGroup/CreateOrderToPrintPageActionGroup.xml

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

@@ -19,20 +19,26 @@
1919
<amOnPage url="{{StorefrontCategoryPage.url(Category.name)}}" stepKey="onCategoryPage"/>
2020
<waitForPageLoad stepKey="waitForPageLoad1"/>
2121
<moveMouseOver selector="{{StorefrontCategoryMainSection.ProductItemInfo}}" stepKey="hoverProduct"/>
22+
<waitForElementClickable selector="{{StorefrontCategoryMainSection.AddToCartBtn}}" stepKey="waitForAddToCartButtonClickable"/>
2223
<click selector="{{StorefrontCategoryMainSection.AddToCartBtn}}" stepKey="addToCart"/>
2324
<waitForElementVisible selector="{{StorefrontCategoryMainSection.SuccessMsg}}" time="30" stepKey="waitForProductAdded"/>
25+
<waitForElementClickable selector="{{StorefrontMinicartSection.showCart}}" stepKey="waitForClickCartButtonClickable"/>
2426
<click selector="{{StorefrontMinicartSection.showCart}}" stepKey="clickCart"/>
27+
<waitForElementClickable selector="{{StorefrontMinicartSection.showCart}}" stepKey="waitForGoToCheckoutButtonClickable"/>
2528
<click selector="{{StorefrontMinicartSection.goToCheckout}}" stepKey="goToCheckout"/>
2629
<waitForPageLoad stepKey="waitForPageLoad2"/>
2730
<waitForPageLoad stepKey="waitForLoadingMask"/>
2831
<waitForElementClickable selector="{{CheckoutShippingMethodsSection.firstShippingMethod}}" stepKey="waitForFirstShippingMethodClickable" />
2932
<click selector="{{CheckoutShippingMethodsSection.firstShippingMethod}}" stepKey="selectFirstShippingMethod"/>
3033
<waitForPageLoad stepKey="waitForLoadingMask2"/>
31-
<waitForElement selector="{{CheckoutShippingMethodsSection.next}}" time="30" stepKey="waitForNextButton"/>
34+
<waitForElementClickable selector="{{CheckoutShippingMethodsSection.next}}" stepKey="waitForNextButton"/>
3235
<click selector="{{CheckoutShippingMethodsSection.next}}" stepKey="clickNext"/>
33-
<waitForElement selector="{{CheckoutPaymentSection.placeOrder}}" time="30" stepKey="waitForPlaceOrderButton"/>
36+
<waitForElementClickable selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="waitForPlaceOrderButton"/>
3437
<click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder"/>
38+
<waitForElementClickable selector="{{CheckoutSuccessMainSection.orderLink}}" stepKey="waitForClickOrderLink"/>
3539
<click selector="{{CheckoutSuccessMainSection.orderLink}}" stepKey="clickOrderLink"/>
40+
<waitForElementClickable selector="{{StorefrontCustomerOrderViewSection.printOrderLink}}" stepKey="waitForClickPrintOrderLink"/>
3641
<click selector="{{StorefrontCustomerOrderViewSection.printOrderLink}}" stepKey="clickPrintOrderLink"/>
42+
<waitForPageLoad stepKey="waitForPrintOrderPageLoad"/>
3743
</actionGroup>
3844
</actionGroups>

‎app/code/Magento/Sales/Test/Mftf/ActionGroup/CreateOrderToPrintPageWithSelectedPaymentMethodActionGroup.xml

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

@@ -13,7 +13,7 @@
1313
<description>EXTENDS: CreateOrderToPrintPageActionGroup. Clicks on 'Check / Money Order'.</description>
1414
</annotations>
1515

16-
<waitForElement selector="{{CheckoutPaymentSection.paymentSectionTitle}}" time="30" after="clickNext" stepKey="waitForPaymentSectionLoaded"/>
16+
<waitForElement selector="{{CheckoutPaymentSection.paymentSectionTitle}}" after="clickNext" stepKey="waitForPaymentSectionLoaded"/>
1717
<conditionalClick selector="{{CheckoutPaymentSection.checkMoneyOrderPayment}}" dependentSelector="{{CheckoutPaymentSection.billingAddress}}" visible="false" before="waitForPlaceOrderButton" stepKey="clickCheckMoneyOrderPayment"/>
1818
</actionGroup>
1919
</actionGroups>

‎app/code/Magento/Sales/Test/Mftf/Test/StorefrontPrintOrderGuestTest.xml

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

@@ -270,17 +270,7 @@
270270

271271
<!-- Click on the "Print Order" button -->
272272
<click selector="{{StorefrontGuestOrderViewSection.printOrder}}" stepKey="printOrder"/>
273-
<helper class="Magento\Sales\Test\Mftf\Helper\SalesHelper" method="switchToWindowWithUrlAndClosePrintDialogIfEncountered" stepKey="switchToWindowWithUrlAndClosePrintDialogIfEncountered">
274-
<argument name="expectedUrl">sales/guest/print/order_id/</argument>
275-
<argument name="expectedUrlComparisonType">COMPARISON_PATH_SUBSET_MATCH</argument>
276-
</helper>
277-
278-
<comment userInput="Step key preserved for backwards compatibility" stepKey="waitForPrintWindowToOpen" />
279-
<comment userInput="Step key preserved for backwards compatibility" stepKey="switchToWindow"/>
280-
<comment userInput="Step key preserved for backwards compatibility" stepKey="waitForPrintTabToOpen"/>
281-
<comment userInput="Step key preserved for backwards compatibility" stepKey="switchToTab"/>
282-
<comment userInput="Step key preserved for backwards compatibility" stepKey="waitForPrintPreviewToLoad"/>
283-
<comment userInput="Step key preserved for backwards compatibility" stepKey="seePrintPage"/>
273+
<waitForPageLoad stepKey="waitForPrintOrderPageLoad"/>
284274

285275
<!-- AssertSalesPrintOrderProducts -->
286276
<see userInput="$createBundleProduct.name$" selector="{{StorefrontOrderDetailsSection.productNameCell}}" stepKey="seeBundleProduct"/>
@@ -304,6 +294,5 @@
304294

305295
<!-- AssertShippingMethodOnPrintOrder -->
306296
<see userInput="Flat Rate - Fixed" selector="{{StorefrontOrderDetailsSection.shippingMethod}}" stepKey="assertShippingMethodOnPrintOrder"/>
307-
<switchToPreviousTab stepKey="switchToPreviousTab"/>
308297
</test>
309298
</tests>

‎app/code/Magento/Sales/Test/Mftf/Test/StorefrontRedirectToOrderHistoryTest.xml

Lines changed: 6 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -50,34 +50,15 @@
5050

5151
<!-- Go to 'print order' page by grabbed order id and assert browser does not redirect to order history page -->
5252
<grabFromCurrentUrl regex="~/order_id/(\d+)/~" stepKey="grabOrderIdFromURL"/>
53-
<comment userInput="BIC workaround" stepKey="waitForPrintWindowToOpen"/>
54-
55-
<helper class="Magento\Sales\Test\Mftf\Helper\SalesHelper" method="switchToWindowWithUrlAndClosePrintDialogIfEncountered" stepKey="switchToWindowWithUrlAndClosePrintDialogIfEncountered">
56-
<argument name="expectedUrl">sales/order/print/order_id/{$grabOrderIdFromURL}</argument>
57-
<argument name="expectedUrlComparisonType">COMPARISON_PATH_SUBSET_MATCH</argument>
58-
</helper>
59-
60-
<comment userInput="Step key preserved for backwards compatibility" stepKey="switchToPrintPage"/>
61-
<comment userInput="Step key preserved for backwards compatibility" stepKey="checkPrintPage"/>
62-
63-
<comment userInput="Step key preserved for backwards compatibility" stepKey="openNewTab"/>
64-
<comment userInput="Step key preserved for backwards compatibility" stepKey="waitForNewTabToOpen" />
65-
<comment userInput="Step key preserved for backwards compatibility" stepKey="switchForward"/>
66-
<comment userInput="Step key preserved for backwards compatibility" stepKey="waitForNewTab3HTML" />
67-
<comment userInput="Step key preserved for backwards compatibility" stepKey="duplicatePrintPage"/>
68-
<comment userInput="Step key preserved for backwards compatibility" stepKey="waitForDuplicatePrintWindowToOpen" />
69-
<comment userInput="Step key preserved for backwards compatibility" stepKey="switchToDuplicatePrintPage"/>
70-
<comment userInput="Step key preserved for backwards compatibility" stepKey="checkDuplicatePrintPage"/>
71-
72-
<!-- Log out of customer 1's account -->
73-
<comment userInput="Step key preserved for backwards compatibility" stepKey="openNewTab2"/>
74-
<comment userInput="Step key preserved for backwards compatibility" stepKey="waitForNewTabToOpen1" />
75-
<comment userInput="Step key preserved for backwards compatibility" stepKey="switchForward2"/>
76-
<comment userInput="Step key preserved for backwards compatibility" stepKey="waitForNewTab2HTML" />
7753

7854
<amOnPage url="{{StorefrontCustomerSignOutPage.url}}" stepKey="signOut"/>
7955
<waitForLoadingMaskToDisappear stepKey="waitSignOutPage"/>
8056

57+
<openNewTab stepKey="openNewTab1"/>
58+
<waitForPageLoad stepKey="waitForNewTabToOpen1" />
59+
<switchToNextTab stepKey="switchForward1"/>
60+
<waitForElement selector="body" stepKey="waitForNewTabHTML1"/>
61+
8162
<!-- Log in to Storefront as Customer 2 -->
8263
<actionGroup ref="LoginToStorefrontActionGroup" stepKey="signUp2">
8364
<argument name="Customer" value="$createCustomer2$"/>
@@ -88,18 +69,10 @@
8869
<argument name="Category" value="$createCategory$"/>
8970
</actionGroup>
9071

91-
<comment userInput="Step key preserved for backwards compatibility" stepKey="waitForPrintWindowToOpen2" />
92-
<helper class="Magento\Sales\Test\Mftf\Helper\SalesHelper" method="switchToWindowWithUrlAndClosePrintDialogIfEncountered" stepKey="switchToWindowWithUrlAndClosePrintDialogIfEncountered2">
93-
<argument name="expectedUrl">sales/order/print/order_id/</argument>
94-
<argument name="expectedUrlComparisonType">COMPARISON_PATH_SUBSET_MATCH</argument>
95-
</helper>
96-
<comment userInput="Step key preserved for backwards compatibility" stepKey="switchToPrintPage2"/>
97-
<comment userInput="Step key preserved for backwards compatibility" stepKey="checkPrintPage2"/>
98-
9972
<openNewTab stepKey="openNewTab3"/>
10073
<waitForPageLoad stepKey="waitForNewTabToOpen2" />
10174
<switchToNextTab stepKey="switchForward4"/>
102-
<waitForElement selector="body" stepKey="waitForNewTabHTML" />
75+
<waitForElement selector="body" stepKey="waitForNewTabHTML"/>
10376

10477
<!-- Assert trying to load 'print order' page as customer 2 with the the order id created by customer 1 will redirect to 'order history' page -->
10578
<amOnPage url="{{StorefrontSalesOrderPrintPage.url({$grabOrderIdFromURL})}}" stepKey="duplicatePrintPage2"/>

0 commit comments

Comments
 (0)