Skip to content

Commit acc9b81

Browse files
vlmedvlmed
committed
Fixed Mftf tests
1 parent f75718b commit acc9b81

9 files changed

+44
-15
lines changed

‎app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptionsTest.xml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,8 +169,9 @@
169169
<see selector="{{AdminOrderTotalSection.subTotal}}" userInput="{$finalProductPrice}" stepKey="seeOrderSubTotal"/>
170170

171171
<!-- Go to Customer Order Page and Checking the correctness of displayed custom options for user parameters on Order -->
172-
173-
<amOnPage url="{{StorefrontCustomerOrderViewPage.url({$grabOrderNumber})}}" stepKey="amOnOrderPage"/>
172+
<actionGroup ref="StorefrontGoToOrderViewPageActionGroup" stepKey="goToOrderViewPage">
173+
<argument name="orderIncrementId" value="$grabOrderNumber" />
174+
</actionGroup>
174175

175176
<see selector="{{StorefrontCustomerOrderSection.productCustomOptions($$createProduct.name$$, ProductOptionField.title, ProductOptionField.title)}}" userInput="{{ProductOptionField.title}}" stepKey="seeStorefontOrderProductOptionField1" />
176177
<see selector="{{StorefrontCustomerOrderSection.productCustomOptions($$createProduct.name$$, ProductOptionArea.title, ProductOptionArea.title)}}" userInput="{{ProductOptionArea.title}}" stepKey="seeStorefontOrderProductOptionArea1"/>

‎app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerPlaceOrderWithNewAddressesThatWasEditedTest.xml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,9 @@
8686
<see userInput="{{UK_Not_Default_Address.postcode}}"
8787
selector="{{StorefrontCustomerAddressesSection.addressesList}}" stepKey="checkNewAddressesPostcode"/>
8888
<!--Order review page has address that was created during checkout-->
89-
<amOnPage url="{{StorefrontCustomerOrderViewPage.url({$grabOrderNumber})}}" stepKey="goToOrderReviewPage"/>
89+
<actionGroup ref="StorefrontGoToOrderViewPageActionGroup" stepKey="goToOrderViewPage">
90+
<argument name="orderIncrementId" value="$grabOrderNumber" />
91+
</actionGroup>
9092
<see userInput="{{UK_Not_Default_Address.street[0]}} {{UK_Not_Default_Address.city}}, {{UK_Not_Default_Address.postcode}}"
9193
selector="{{StorefrontCustomerOrderViewSection.shippingAddress}}" stepKey="checkShippingAddress"/>
9294
<see userInput="{{US_Address_TX_Default_Billing.street[0]}}"

‎app/code/Magento/Checkout/Test/Mftf/Test/StorefrontRefreshPageDuringGuestCheckoutTest.xml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,9 @@
5858
<grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber}}" stepKey="grabOrderNumber"/>
5959

6060
<!-- Order review page has address that was created during checkout -->
61-
<amOnPage url="{{AdminOrderPage.url({$grabOrderNumber})}}" stepKey="navigateToOrderPage"/>
61+
<actionGroup ref="OpenOrderByIdActionGroup" stepKey="filterOrderGridById">
62+
<argument name="orderId" value="$grabOrderNumber"/>
63+
</actionGroup>
6264
<waitForPageLoad stepKey="waitForCreatedOrderPage"/>
6365
<see selector="{{AdminShipmentAddressInformationSection.shippingAddress}}" userInput="{{CustomerAddressSimple.street[0]}} {{CustomerAddressSimple.city}}, {{CustomerAddressSimple.state}}, {{CustomerAddressSimple.postcode}}" stepKey="checkShippingAddress"/>
6466
</test>

‎app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontGoToOrderViewPageActionGroup.xml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
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="StorefrontGoToOrderViewPageActionGroup">
12+
<annotations>
13+
<description>Navigate to storefront order view page</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="orderIncrementId" type="string"/>
17+
</arguments>
18+
<amOnPage url="{{StorefrontCustomerOrdersHistoryPage.url}}" stepKey="goToCustomerOrderHistoryPage" />
19+
<waitForPageLoad stepKey="waitForPageLoad" />
20+
<click selector="{{StorefrontCustomerOrderSection.viewOrderByOrderNumber(orderIncrementId)}}" stepKey="clickOrderView" />
21+
</actionGroup>
22+
</actionGroups>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77
-->
88

9-
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
1111
<test name="AdminPanelIsFrozenIfStorefrontIsOpenedViaCustomerViewTest">
1212
<annotations>

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11-
<actionGroup name="AdminAssertContainsMessageOrderCreatedByAdminActionGroup">
11+
<actionGroup name="AdminAssertContainsMessageOrderCreatedByAdminActionGroup" extends="FilterOrderGridByIdActionGroup">
1212
<annotations>
1313
<description>Assert Admin Order page contains message about Order created by a Store Administrator.
1414
</description>
@@ -18,7 +18,8 @@
1818
<argument name="adminUserFullName" type="string"/>
1919
</arguments>
2020

21-
<amOnPage url="{{AdminOrderPage.url(orderId)}}" stepKey="gotoOrderPage"/>
21+
<click selector="{{AdminDataGridTableSection.firstRow}}" after="clickOrderApplyFilters" stepKey="openOrderViewPage"/>
22+
<waitForPageLoad after="openOrderViewPage" stepKey="waitForOrderViewPageOpened"/>
2223
<waitForPageLoad stepKey="waitForPageLoad"/>
2324
<see userInput="Order Placed by {{adminUserFullName}} using Login as Customer"
2425
stepKey="seeMessageOrderCreatedByAdmin"/>

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
<argument name="orderId" type="string"/>
1818
</arguments>
1919

20-
<amOnPage url="{{StorefrontCustomerOrderViewPage.url(orderId)}}" stepKey="gotoOrderPage"/>
20+
<amOnPage url="{{StorefrontCustomerOrdersHistoryPage.url}}" stepKey="amOnTheCustomerOrderHistoryPage"/>
21+
<click selector="{{StorefrontCustomerOrderSection.viewOrderByOrderNumber(orderId)}}" stepKey="goToOrderReviewPage" />
2122
<waitForPageLoad stepKey="waitForPageLoad"/>
2223
<see userInput="Order Placed by Store Administrator" stepKey="seeMessageOrderCreatedByAdmin"/>
2324
</actionGroup>

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,16 @@
2727
<createData entity="CustomerCart" stepKey="createCustomerCart">
2828
<requiredEntity createDataKey="createCustomer"/>
2929
</createData>
30-
30+
3131
<createData entity="CustomerCartItem" stepKey="addCartItem">
3232
<requiredEntity createDataKey="createCustomerCart"/>
3333
<requiredEntity createDataKey="createSimpleProduct"/>
3434
</createData>
35-
35+
3636
<createData entity="CustomerAddressInformation" stepKey="addCustomerOrderAddress">
3737
<requiredEntity createDataKey="createCustomerCart"/>
3838
</createData>
39-
39+
4040
<updateData createDataKey="createCustomerCart" entity="CustomerOrderPaymentMethod" stepKey="sendCustomerPaymentInformation">
4141
<requiredEntity createDataKey="createCustomerCart"/>
4242
</updateData>
@@ -64,9 +64,9 @@
6464
<actionGroup ref="OpenOrderByIdActionGroup" stepKey="filterOrdersGridById">
6565
<argument name="orderId" value="{$getOrderId}"/>
6666
</actionGroup>
67-
67+
<grabFromCurrentUrl regex="~/order_id/(\d+)/~" stepKey="getOrderIdFromUrl"/>
6868
<actionGroup ref="StartToCreateCreditMemoActionGroup" stepKey="startToCreateCreditMemo">
69-
<argument name="orderId" value="{$getOrderId}"/>
69+
<argument name="orderId" value="{$getOrderIdFromUrl}"/>
7070
</actionGroup>
7171
<fillField selector="{{AdminCreditMemoTotalSection.refundShipping}}" userInput="0" stepKey="setRefundShipping"/>
7272
<actionGroup ref="UpdateCreditMemoTotalsActionGroup" stepKey="updateCreditMemoTotals"/>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,13 +89,13 @@
8989
<actionGroup ref="OpenOrderByIdActionGroup" stepKey="filterOrdersGridById">
9090
<argument name="orderId" value="{$grabOrderNumber}"/>
9191
</actionGroup>
92-
92+
<grabFromCurrentUrl regex="~/order_id/(\d+)/~" stepKey="getOrderId"/>
9393
<click selector="{{AdminOrderDetailsMainActionsSection.ship}}" stepKey="clickShipAction"/>
9494
<click selector="{{AdminShipmentMainActionsSection.submitShipment}}" stepKey="clickSubmitShipment"/>
9595

9696
<actionGroup ref="StorefrontNavigateToCustomerOrdersHistoryPageActionGroup" stepKey="goToOrderHistoryPage"/>
9797
<!--Step12. Go to Customer Order Shipment Page and Checking the correctness of displayed Qty Shipped -->
98-
<amOnPage url="{{StorefrontCustomerOrderShipmentPage.url({$grabOrderNumber})}}" stepKey="amOnOrderShipmentPage"/>
98+
<amOnPage url="{{StorefrontCustomerOrderShipmentPage.url({$getOrderId})}}" stepKey="amOnOrderShipmentPage"/>
9999
<waitForPageLoad time="30" stepKey="waitForOrderShipmentsPageLoad"/>
100100
<actionGroup ref="AssertStorefrontOrderShipmentsQtyShippedActionGroup" stepKey="verifyAssertOrderShipments">
101101
<argument name="expectedQtyShipped" value="2.14"/>

0 commit comments

Comments
 (0)