Skip to content

Commit 0308590

Browse files
okolesnykokolesnyk
committed
MFTF Stability control
 - DEPRECATE bad Action Group
1 parent 123cf1b commit 0308590

File tree

69 files changed

+163
-79
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+163
-79
lines changed

‎app/code/Magento/Bundle/Test/Mftf/Test/EditOrderWithBundleProductBackendTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@
110110
<amOnPage url="{{AdminProductEditPage.url($$createBundleProduct.id$$)}}" stepKey="openBundleProductEditPage"/>
111111

112112
<!--Create new customer order.-->
113-
<actionGroup ref="NavigateToNewOrderPageExistingCustomerActionGroup" stepKey="navigateToNewOrderWithExistingCustomer">
113+
<actionGroup ref="AdminNavigateToNewOrderPageExistingCustomerActionGroup" stepKey="navigateToNewOrderWithExistingCustomer">
114114
<argument name="customer" value="$createCustomer$"/>
115115
</actionGroup>
116116
<!--Add bundle product to order.-->
@@ -134,7 +134,7 @@
134134
<actionGroup ref="AdminSubmitOrderActionGroup" stepKey="submitOrder"/>
135135
<wait time="2" stepKey="waitForPageLoad1"/>
136136
<!--Create new customer order.-->
137-
<actionGroup ref="NavigateToNewOrderPageExistingCustomerActionGroup" stepKey="navigateToNewOrderWithExistingCustomer2">
137+
<actionGroup ref="AdminNavigateToNewOrderPageExistingCustomerActionGroup" stepKey="navigateToNewOrderWithExistingCustomer2">
138138
<argument name="customer" value="$createCustomer2$"/>
139139
</actionGroup>
140140
<!--Add bundle product to order.-->

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,10 @@
147147
<see userInput="You saved the rule." stepKey="RuleSaved"/>
148148

149149
<!--Create new order-->
150-
<actionGroup ref="NavigateToNewOrderPageExistingCustomerActionGroup" stepKey="CreateNewOrder">
150+
<actionGroup ref="AdminNavigateToNewOrderPageExistingCustomerActionGroup" stepKey="CreateNewOrder">
151151
<argument name="customer" value="Simple_US_Customer"/>
152+
</actionGroup>
153+
<actionGroup ref="AdminSelectStoreDuringOrderCreationActionGroup" stepKey="selectCustomStore">
152154
<argument name="storeView" value="customStore"/>
153155
</actionGroup>
154156

‎app/code/Magento/ConfigurableProduct/Test/Mftf/Test/NoOptionAvailableToConfigureDisabledProductTest.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@
129129
<actionGroup ref="SaveProductFormActionGroup" stepKey="saveSecondProductForm"/>
130130
<!-- Go to created customer page -->
131131
<comment userInput="Go to created customer page" stepKey="goToCreatedCustomerPage"/>
132-
<actionGroup ref="NavigateToNewOrderPageExistingCustomerActionGroup" stepKey="createNewOrder">
132+
<actionGroup ref="AdminNavigateToNewOrderPageExistingCustomerActionGroup" stepKey="createNewOrder">
133133
<argument name="customer" value="$$createCustomer$$"/>
134134
</actionGroup>
135135
<click selector="{{AdminOrderFormItemsSection.addProducts}}" stepKey="clickToAddProduct"/>
@@ -145,7 +145,7 @@
145145
<dontSee userInput="$$createConfigProductAttributeOption1.option[store_labels][1][label]$$" stepKey="dontSeeOption1"/>
146146
<!-- Go to created customer page again -->
147147
<comment userInput="Go to created customer page again" stepKey="goToCreatedCustomerPageAgain"/>
148-
<actionGroup ref="NavigateToNewOrderPageExistingCustomerActionGroup" stepKey="createNewOrderAgain">
148+
<actionGroup ref="AdminNavigateToNewOrderPageExistingCustomerActionGroup" stepKey="createNewOrderAgain">
149149
<argument name="customer" value="$$createCustomer$$"/>
150150
</actionGroup>
151151
<click selector="{{AdminOrderFormItemsSection.addProducts}}" stepKey="clickToAddProductAgain"/>
@@ -160,7 +160,7 @@
160160
<waitForPageLoad stepKey="waitForNewOrderPageLoad"/>
161161
<see userInput="There are no source items with the in stock status" stepKey="seeTheErrorMessageDisplayed"/>
162162

163-
<actionGroup ref="NavigateToNewOrderPageExistingCustomerActionGroup" stepKey="createNewOrderThirdTime">
163+
<actionGroup ref="AdminNavigateToNewOrderPageExistingCustomerActionGroup" stepKey="createNewOrderThirdTime">
164164
<argument name="customer" value="$createCustomer$"/>
165165
</actionGroup>
166166
<actionGroup ref="AddSimpleProductToOrderActionGroup" stepKey="addThirdChildProductToOrder">

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
3434
</after>
3535

36-
<actionGroup ref="NavigateToNewOrderPageExistingCustomerActionGroup" stepKey="navigateToNewOrderWithExistingCustomer">
36+
<actionGroup ref="AdminNavigateToNewOrderPageExistingCustomerActionGroup" stepKey="navigateToNewOrderWithExistingCustomer">
3737
<argument name="customer" value="$createCustomer$"/>
3838
</actionGroup>
3939
<actionGroup ref="AddSimpleProductToOrderActionGroup" stepKey="addSimpleProductToTheOrder">

‎app/code/Magento/Reports/Test/Mftf/Test/AdminReportsOrderedGroupedBySkuTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
</after>
5353

5454
<!--Add first configurable product to order-->
55-
<actionGroup ref="NavigateToNewOrderPageExistingCustomerActionGroup" stepKey="navigateToFirstOrderWithExistingCustomer">
55+
<actionGroup ref="AdminNavigateToNewOrderPageExistingCustomerActionGroup" stepKey="navigateToFirstOrderWithExistingCustomer">
5656
<argument name="customer" value="$$createCustomer$$"/>
5757
</actionGroup>
5858
<actionGroup ref="AddConfigurableProductToOrderActionGroup" stepKey="addFirstConfigurableProductToOrder">
@@ -63,7 +63,7 @@
6363
<actionGroup ref="AdminOrderClickSubmitOrderActionGroup" stepKey="submitFirstOrder" />
6464

6565
<!--Add second configurable product to order-->
66-
<actionGroup ref="NavigateToNewOrderPageExistingCustomerActionGroup" stepKey="navigateToSecondOrderWithExistingCustomer">
66+
<actionGroup ref="AdminNavigateToNewOrderPageExistingCustomerActionGroup" stepKey="navigateToSecondOrderWithExistingCustomer">
6767
<argument name="customer" value="$$createCustomer$$"/>
6868
</actionGroup>
6969
<actionGroup ref="AddConfigurableProductToOrderActionGroup" stepKey="addSecondConfigurableProductToOrder">

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

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
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="AdminNavigateToNewOrderPageExistingCustomerActionGroup">
12+
<annotations>
13+
<description>Goes to the Admin Orders grid page. Clicks on 'Create New Order'. Filters the grid for the provided Customer. Clicks on the Customer. Validates that the Page Title is present and correct.</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="customer"/>
17+
</arguments>
18+
19+
<amOnPage url="{{AdminOrdersPage.url}}" stepKey="navigateToOrderIndexPage"/>
20+
<waitForPageLoad stepKey="waitForIndexPageLoad"/>
21+
<see selector="{{AdminHeaderSection.pageTitle}}" userInput="Orders" stepKey="seeIndexPageTitle"/>
22+
<click selector="{{AdminOrdersGridSection.createNewOrder}}" stepKey="clickCreateNewOrder"/>
23+
<waitForPageLoad stepKey="waitForCustomerGridLoad"/>
24+
25+
<!--Clear grid filters-->
26+
<conditionalClick selector="{{AdminOrderCustomersGridSection.resetButton}}" dependentSelector="{{AdminOrderCustomersGridSection.resetButton}}" visible="true" stepKey="clearExistingCustomerFilters"/>
27+
<fillField userInput="{{customer.email}}" selector="{{AdminOrderCustomersGridSection.emailInput}}" stepKey="filterEmail"/>
28+
<click selector="{{AdminOrderCustomersGridSection.apply}}" stepKey="applyFilter"/>
29+
<waitForPageLoad stepKey="waitForFilteredCustomerGridLoad"/>
30+
<click selector="{{AdminOrderCustomersGridSection.firstRow}}" stepKey="clickOnCustomer"/>
31+
<waitForPageLoad stepKey="waitForCreateOrderPageLoad"/>
32+
</actionGroup>
33+
</actionGroups>

‎app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminNavigateToNewOrderPageNewCustomerActionGroup.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+
<!--Navigate to create order page (New Order -> Create New Customer)-->
12+
<actionGroup name="AdminNavigateToNewOrderPageNewCustomerActionGroup">
13+
<annotations>
14+
<description>Goes to the Admin Orders grid page. Clicks on 'Create New Order'. Clicks on 'Create New Customer'.</description>
15+
</annotations>
16+
<amOnPage url="{{AdminOrdersPage.url}}" stepKey="navigateToOrderIndexPage"/>
17+
<waitForPageLoad stepKey="waitForIndexPageLoad"/>
18+
<see selector="{{AdminHeaderSection.pageTitle}}" userInput="Orders" stepKey="seeIndexPageTitle"/>
19+
<click selector="{{AdminOrdersGridSection.createNewOrder}}" stepKey="clickCreateNewOrder"/>
20+
<click selector="{{AdminOrderFormActionSection.CreateNewCustomer}}" stepKey="clickCreateCustomer"/>
21+
<waitForPageLoad stepKey="waitForPageLoaded" />
22+
</actionGroup>
23+
</actionGroups>

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
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="AdminSelectStoreDuringOrderCreationActionGroup">
12+
<annotations>
13+
<description>Selects provided Store View.</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="storeView" defaultValue="_defaultStore"/>
17+
</arguments>
18+
19+
<waitForElementVisible selector="{{AdminOrderStoreScopeTreeSection.storeOption(storeView.name)}}" stepKey="waitForStoreOption" />
20+
<selectOption selector="{{AdminOrderStoreScopeTreeSection.storeOption(storeView.name)}}" stepKey="selectStoreView"/>
21+
<waitForPageLoad stepKey="waitForLoad"/>
22+
<see selector="{{AdminHeaderSection.pageTitle}}" userInput="Create New Order" stepKey="seeNewOrderPageTitle"/>
23+
</actionGroup>
24+
</actionGroups>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
<amOnPage stepKey="navigateToNewOrderPage" url="{{AdminOrderCreatePage.url}}"/>
2222
<click stepKey="chooseCustomer" selector="{{AdminOrdersGridSection.customerInOrdersSection(customer.firstname)}}"/>
2323
<waitForPageLoad stepKey="waitForStoresPageOpened"/>
24-
<waitForElementClickable stepKey="waitForStoreClickable" selector="{{AdminOrderStoreScopeTreeSection.storeForOrder(storeView.name)}}"/>
25-
<click stepKey="chooseStore" selector="{{AdminOrderStoreScopeTreeSection.storeForOrder(storeView.name)}}"/>
24+
<waitForElementClickable stepKey="waitForStoreClickable" selector="{{AdminOrderStoreScopeTreeSection.storeOption(storeView.name)}}"/>
25+
<selectOption stepKey="chooseStore" selector="{{AdminOrderStoreScopeTreeSection.storeOption(storeView.name)}}"/>
2626
<scrollToTopOfPage stepKey="scrollToTop"/>
2727
<waitForPageLoad stepKey="waitForStoreToAppear"/>
2828
<click selector="{{OrdersGridSection.addProducts}}" stepKey="clickOnAddProducts"/>

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

Lines changed: 1 addition & 1 deletion
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="NavigateToNewOrderPageExistingCustomerActionGroup">
11+
<actionGroup name="NavigateToNewOrderPageExistingCustomerActionGroup" deprecated="This Action Group is deprecated. Please use AdminNavigateToNewOrderPageExistingCustomerActionGroup + AdminSelectStoreDuringOrderCreationActionGroup.">
1212
<annotations>
1313
<description>Goes to the Admin Orders grid page. Clicks on 'Create New Order'. Filters the grid for the provided Customer. Clicks on the Customer. Selects the provided Store View, if present. Validates that the Page Title is present and correct.</description>
1414
</annotations>

0 commit comments

Comments
 (0)