Skip to content

Commit 6134b10

Browse files
author
OlgaVasyltsun
committed
MC-24169: Fix Skipped MFTF Tests From MC-17140: MC-5719, MC-10924
1 parent f2aa57e commit 6134b10

File tree

7 files changed

+130
-4
lines changed

7 files changed

+130
-4
lines changed

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

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
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="StorefrontOpenOrderFromSuccessPageActionGroup">
12+
<annotations>
13+
<description>Click order number link from checkout success page and check order number on order view page.</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="orderNumber" defaultValue="000000001" type="string"/>
17+
</arguments>
18+
19+
<click selector="{{CheckoutSuccessMainSection.orderLinkByOrderNumber(orderNumber)}}" stepKey="clickOrderNumberLink"/>
20+
<waitForPageLoad stepKey="waitForOrderPageIsLoaded"/>
21+
<see userInput="Order # {{orderNumber}}" selector="{{StorefrontCustomerOrderViewSection.orderTitle}}" stepKey="assertOrderNumberIsCorrect"/>
22+
</actionGroup>
23+
</actionGroups>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,6 @@
2020
<element name="createAnAccount" type="button" selector="[data-bind*=&quot;i18n: 'Create an Account'&quot;]" timeout="30"/>
2121
<element name="printLink" type="button" selector=".print" timeout="30"/>
2222
<element name="orderNumberWithoutLink" type="text" selector="//div[contains(@class, 'checkout-success')]//p/span"/>
23+
<element name="orderLinkByOrderNumber" type="text" selector="//div[contains(@class,'success')]//a[contains(.,'{{orderNumber}}')]" parameterized="true" timeout="30"/>
2324
</section>
2425
</sections>

‎app/code/Magento/Customer/Test/Mftf/Test/AdminChangeAllCustomersGroupViaGridTest.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+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
11+
<test name="AdminChangeAllCustomersGroupViaGridTest" extends="AdminChangeSingleCustomerGroupViaGridTest">
12+
<annotations>
13+
<title value="Change all customers' group via grid"/>
14+
<description value="Select All customers to change their group"/>
15+
<testCaseId value="MC-26040"/>
16+
</annotations>
17+
18+
<remove keyForRemoval="filterCustomer"/>
19+
<actionGroup ref="ClearFiltersAdminDataGridActionGroup" before="selectCustomer" stepKey="clearFilters"/>
20+
<actionGroup ref="AdminSelectAllCustomers" stepKey="selectCustomer"/>
21+
</test>
22+
</tests>

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

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
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+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
11+
<test name="AdminChangeSingleCustomerGroupViaGridTest">
12+
<annotations>
13+
<features value="Customer"/>
14+
<title value="Change a single customer group via grid"/>
15+
<description value="From the selection of All Customers select a single customer to change their group"/>
16+
<severity value="MAJOR"/>
17+
<testCaseId value="MC-26039"/>
18+
<stories value="Customer Edit"/>
19+
<group value="customer"/>
20+
<group value="mtf_migrated"/>
21+
</annotations>
22+
23+
<before>
24+
<createData entity="Simple_US_Customer" stepKey="createCustomer"/>
25+
<createData entity="CustomerGroupChange" stepKey="createCustomerGroup"/>
26+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
27+
</before>
28+
<after>
29+
<!--Delete created data-->
30+
<deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
31+
<deleteData createDataKey="createCustomerGroup" stepKey="deleteCustomerGroup"/>
32+
<actionGroup ref="NavigateToAllCustomerPage" stepKey="navigateToCustomersPage"/>
33+
<actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearCustomersGridFilter"/>
34+
<actionGroup ref="logout" stepKey="logoutFromAdmin"/>
35+
</after>
36+
37+
<actionGroup ref="NavigateToAllCustomerPage" stepKey="navigateToCustomersPage"/>
38+
<actionGroup ref="AdminFilterCustomerGridByEmail" stepKey="filterCustomer">
39+
<argument name="email" value="$$createCustomer.email$$"/>
40+
</actionGroup>
41+
<actionGroup ref="AdminSelectCustomerByEmail" stepKey="selectCustomer">
42+
<argument name="customerEmail" value="$$createCustomer.email$$"/>
43+
</actionGroup>
44+
<actionGroup ref="SetCustomerGroupForSelectedCustomersViaGrid" stepKey="setCustomerGroup">
45+
<argument name="groupName" value="$$createCustomerGroup.code$$"/>
46+
</actionGroup>
47+
<actionGroup ref="AdminFilterCustomerGridByEmail" stepKey="filterCustomerAfterGroupChange">
48+
<argument name="email" value="$$createCustomer.email$$"/>
49+
</actionGroup>
50+
<actionGroup ref="VerifyCustomerGroupForCustomer" stepKey="verifyCustomerGroupSet">
51+
<argument name="customerEmail" value="$$createCustomer.email$$"/>
52+
<argument name="groupName" value="$$createCustomerGroup.code$$"/>
53+
</actionGroup>
54+
</test>
55+
</tests>

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,16 @@
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
1111
<test name="ChangingSingleCustomerGroupViaGrid">
1212
<annotations>
13-
<title value="Change a single customer group via grid"/>
13+
<title value="DEPRECATED Change a single customer group via grid"/>
1414
<description value="From the selection of All Customers select a single customer to change their group"/>
1515
<severity value="MAJOR"/>
1616
<testCaseId value="MC-10921"/>
1717
<stories value="Change Customer Group"/>
1818
<group value="customer"/>
1919
<group value="mtf_migrated"/>
20+
<skip>
21+
<issueId value="DEPRECATED">Use AdminChangeSingleCustomerGroupViaGridTest instead</issueId>
22+
</skip>
2023
</annotations>
2124

2225
<before>
@@ -60,15 +63,15 @@
6063

6164
<test name="ChangingAllCustomerGroupViaGrid" extends="ChangingSingleCustomerGroupViaGrid">
6265
<annotations>
63-
<title value="Change all customers' group via grid"/>
66+
<title value="DEPRECATED Change all customers' group via grid"/>
6467
<description value="Select All customers to change their group"/>
6568
<severity value="MAJOR"/>
6669
<testCaseId value="MC-10924"/>
6770
<stories value="Change Customer Group"/>
6871
<group value="customer"/>
6972
<group value="mtf_migrated"/>
7073
<skip>
71-
<issueId value="MC-17140"/>
74+
<issueId value="DEPRECATED">Use AdminChangeAllCustomersGroupViaGridTest instead</issueId>
7275
</skip>
7376
</annotations>
7477

‎app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminStartCreateCreditMemoFromOrderPageActionGroup.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="AdminStartCreateCreditMemoFromOrderPageActionGroup">
12+
<annotations>
13+
<description>Start to create Credit Memo from order page</description>
14+
</annotations>
15+
<click selector="{{AdminOrderDetailsMainActionsSection.creditMemo}}" stepKey="clickCreditMemoButton"/>
16+
<conditionalClick selector="{{AdminConfirmationModalSection.ok}}" dependentSelector="{{AdminConfirmationModalSection.ok}}"
17+
visible="true" stepKey="acceptModal"/>
18+
<waitForPageLoad time="30" stepKey="waitPageLoaded"/>
19+
<seeInCurrentUrl url="{{AdminCreditMemoNewPage.url}}" stepKey="seeNewCreditMemoUrl"/>
20+
<see selector="{{AdminHeaderSection.pageTitle}}" userInput="New Memo" stepKey="seeNewCreditMemoPageTitle"/>
21+
</actionGroup>
22+
</actionGroups>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<element name="appendComments" type="checkbox" selector=".order-totals-actions #notify_customer"/>
1919
<element name="emailCopy" type="checkbox" selector=".order-totals-actions #send_email"/>
2020
<element name="refundStoreCredit" type="checkbox" selector=".order-totals-actions .field-refund-store-credit input[type='checkbox']"/>
21-
<element name="submitRefundOffline" type="button" selector=".order-totals-actions button[data-ui-id='order-items-submit-button']" timeout="30"/>
21+
<element name="submitRefundOffline" type="button" selector=".order-totals-actions button[data-ui-id='order-items-submit-button']" timeout="60"/>
2222
<element name="creditMemoItem" type="text" selector="#sales_order_view_tabs_order_creditmemos"/>
2323
<element name="viewMemo" type="text" selector="div#sales_order_view_tabs_order_creditmemos_content a.action-menu-item"/>
2424
<element name="refundOffline" type="button" selector=".order-totals-actions button[data-ui-id='order-items-submit-offline']"/>

0 commit comments

Comments
 (0)