Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[MFTF] Adding AdminCheckOrderStatusInGridActionGroup #33727

Merged
merged 4 commits into from
Nov 12, 2021
Merged

[MFTF] Adding AdminCheckOrderStatusInGridActionGroup #33727

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
69ee6fb
added AdminCheckOrderStatusInGridActionGroup
AnnaAPak Aug 9, 2021
b6d7b0c
Merge branch '2.4-develop' into add-AdminCheckOrderStatusInGridAction…
Oct 14, 2021
37d19af
Merge branch '2.4-develop' into add-AdminCheckOrderStatusInGridAction…
eduard13 Oct 19, 2021
6ab5be0
33727 Merged 2.4 develop and resolved conflicts
engcom-Charlie Oct 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminCheckOrderStatusInGridActionGroup.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
-->

<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
<actionGroup name="AdminCheckOrderStatusInGridActionGroup">
<annotations>
<description>Checks if Order status in Order Grid is expected</description>
</annotations>
<arguments>
<argument name="orderId" type="string"/>
<argument name="status" type="string"/>
</arguments>
<seeElement selector="{{StorefrontCustomerOrderViewSection.orderStatusInGrid(orderId, status)}}" stepKey="seeOrderStatusInGrid"/>
</actionGroup>
</actionGroups>
5 changes: 4 additions & 1 deletion ...ento/Sales/Test/Mftf/Test/AdminCancelTheCreatedOrderWithBankTransferPaymentMethodTest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,9 @@
<!-- Assert OrderId and status in frontend order grid -->
<click selector="{{StorefrontCustomerSidebarSection.sidebarCurrentTab('My Orders')}}" stepKey="clickOnMyOrders"/>
<waitForPageLoad stepKey="waitForOrderDetailsToLoad"/>
<seeElement selector="{{StorefrontCustomerOrderViewSection.orderStatusInGrid('$orderId', 'Canceled')}}" stepKey="seeOrderStatusInGrid"/>
<actionGroup ref="AdminCheckOrderStatusInGridActionGroup" stepKey="seeOrderStatusInGrid">
<argument name="orderId" value="$orderId"/>
<argument name="status" value="Canceled"/>
</actionGroup>
</test>
</tests>
5 changes: 4 additions & 1 deletion ...to/Sales/Test/Mftf/Test/AdminCancelTheCreatedOrderWithCashOnDeliveryPaymentMethodTest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,9 @@
<!-- Assert Order status in frontend grid -->
<click selector="{{StorefrontCustomerSidebarSection.sidebarCurrentTab('My Orders')}}" stepKey="clickOnMyOrders"/>
<waitForPageLoad stepKey="waitForOrderDetailsToLoad"/>
<seeElement selector="{{StorefrontCustomerOrderViewSection.orderStatusInGrid('$orderId', 'Canceled')}}" stepKey="seeOrderStatusInGrid"/>
<actionGroup ref="AdminCheckOrderStatusInGridActionGroup" stepKey="seeOrderStatusInGrid">
<argument name="orderId" value="$orderId"/>
<argument name="status" value="Canceled"/>
</actionGroup>
</test>
</tests>
5 changes: 4 additions & 1 deletion ...o/Sales/Test/Mftf/Test/AdminCancelTheCreatedOrderWithCheckMoneyOrderPaymentMethodTest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,9 @@
<comment userInput="Assert Order status in frontend order grid " stepKey="assertOrderStatusInFrontendComment"/>
<click selector="{{StorefrontCustomerSidebarSection.sidebarCurrentTab('My Orders')}}" stepKey="clickOnMyOrders"/>
<waitForPageLoad stepKey="waitForOrderDetailsToLoad"/>
<seeElement selector="{{StorefrontCustomerOrderViewSection.orderStatusInGrid('$orderId', 'Canceled')}}" stepKey="seeOrderStatusInGrid"/>
<actionGroup ref="AdminCheckOrderStatusInGridActionGroup" stepKey="seeOrderStatusInGrid">
<argument name="orderId" value="$orderId"/>
<argument name="status" value="Canceled"/>
</actionGroup>
</test>
</tests>
5 changes: 4 additions & 1 deletion ...nto/Sales/Test/Mftf/Test/AdminCancelTheCreatedOrderWithPurchaseOrderPaymentMethodTest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,9 @@
<!-- Assert Order status in frontend order grid -->
<click selector="{{StorefrontCustomerSidebarSection.sidebarCurrentTab('My Orders')}}" stepKey="clickOnMyOrders"/>
<waitForPageLoad stepKey="waitForOrderDetailsToLoad"/>
<seeElement selector="{{StorefrontCustomerOrderViewSection.orderStatusInGrid('$orderId', 'Canceled')}}" stepKey="seeOrderStatusInGrid"/>
<actionGroup ref="AdminCheckOrderStatusInGridActionGroup" stepKey="seeOrderStatusInGrid">
<argument name="orderId" value="$orderId"/>
<argument name="status" value="Canceled"/>
</actionGroup>
</test>
</tests>
5 changes: 4 additions & 1 deletion ...e/Magento/Sales/Test/Mftf/Test/AdminCancelTheCreatedOrderWithZeroSubtotalCheckoutTest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,9 @@
<!-- Assert Order status in frontend grid -->
<click selector="{{StorefrontCustomerSidebarSection.sidebarCurrentTab('My Orders')}}" stepKey="clickOnMyOrders"/>
<waitForPageLoad stepKey="waitForOrderDetailsToLoad"/>
<seeElement selector="{{StorefrontCustomerOrderViewSection.orderStatusInGrid('$orderId', 'Canceled')}}" stepKey="seeOrderStatusInGrid"/>
<actionGroup ref="AdminCheckOrderStatusInGridActionGroup" stepKey="seeOrderStatusInGrid">
<argument name="orderId" value="$orderId"/>
<argument name="status" value="Canceled"/>
</actionGroup>
</test>
</tests>
5 changes: 4 additions & 1 deletion app/code/Magento/Sales/Test/Mftf/Test/AdminHoldCreatedOrderTest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,9 @@
<!-- Assert OrderId and status in frontend order grid -->
<click selector="{{StorefrontCustomerSidebarSection.sidebarCurrentTab('My Orders')}}" stepKey="clickOnMyOrders"/>
<waitForPageLoad stepKey="waitForOrderDetailsToLoad"/>
<seeElement selector="{{StorefrontCustomerOrderViewSection.orderStatusInGrid('$orderId', 'On Hold')}}" stepKey="seeOrderStatusInGrid"/>
<actionGroup ref="AdminCheckOrderStatusInGridActionGroup" stepKey="seeOrderStatusInGrid">
<argument name="orderId" value="$orderId"/>
<argument name="status" value="On Hold"/>
</actionGroup>
</test>
</tests>