Skip to content

Commit 016a72b

Browse files
committed
MAGETWO-97338: [TSG] MFTF Pull Request 10 stabilization
1 parent ba7fc81 commit 016a72b

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderActionGroup.xml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,17 +39,23 @@
3939
<actionGroup name="navigateToNewOrderPageExistingCustomer">
4040
<arguments>
4141
<argument name="customer"/>
42+
<argument name="storeView" defaultValue="_defaultStore"/>
4243
</arguments>
4344
<amOnPage url="{{AdminOrdersPage.url}}" stepKey="navigateToOrderIndexPage"/>
4445
<waitForPageLoad stepKey="waitForIndexPageLoad"/>
4546
<see selector="{{AdminHeaderSection.pageTitle}}" userInput="Orders" stepKey="seeIndexPageTitle"/>
4647
<click selector="{{AdminOrdersGridSection.createNewOrder}}" stepKey="clickCreateNewOrder"/>
4748
<waitForPageLoad stepKey="waitForCustomerGridLoad"/>
49+
<!--Clear grid filters-->
50+
<conditionalClick selector="{{AdminOrderCustomersGridSection.resetButton}}" dependentSelector="{{AdminOrderCustomersGridSection.resetButton}}" visible="true" stepKey="clearExistingCustomerFilters"/>
4851
<fillField userInput="{{customer.email}}" selector="{{AdminOrderCustomersGridSection.emailInput}}" stepKey="filterEmail"/>
4952
<click selector="{{AdminOrderCustomersGridSection.apply}}" stepKey="applyFilter"/>
5053
<waitForPageLoad stepKey="waitForFilteredCustomerGridLoad"/>
5154
<click selector="{{AdminOrderCustomersGridSection.firstRow}}" stepKey="clickOnCustomer"/>
5255
<waitForPageLoad stepKey="waitForCreateOrderPageLoad" />
56+
<!-- Select store view if appears -->
57+
<conditionalClick selector="{{AdminOrderStoreScopeTreeSection.storeOption(storeView.name)}}" dependentSelector="{{AdminOrderStoreScopeTreeSection.storeOption(storeView.name)}}" visible="true" stepKey="selectStoreViewIfAppears"/>
58+
<waitForPageLoad stepKey="waitForCreateOrderPageLoadAfterStoreSelect" />
5359
<see selector="{{AdminHeaderSection.pageTitle}}" userInput="Create New Order" stepKey="seeNewOrderPageTitle"/>
5460
</actionGroup>
5561

@@ -316,4 +322,4 @@
316322
<see selector="{{AdminMessagesSection.success}}" userInput="You canceled the order." stepKey="seeCancelSuccessMessage"/>
317323
<see selector="{{AdminOrderDetailsInformationSection.orderStatus}}" userInput="Canceled" stepKey="seeOrderStatusCanceled"/>
318324
</actionGroup>
319-
</actionGroups>
325+
</actionGroups>

app/code/Magento/Sales/Test/Mftf/Section/AdminOrderCustomersGridSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,6 @@
1414
<element name="resetFilter" type="button" selector=".action-tertiary[title='Reset Filter']"/>
1515
<element name="emailInput" type="input" selector="#sales_order_create_customer_grid_filter_email"/>
1616
<element name="firstRow" type="button" selector="tr:nth-of-type(1)[data-role='row']"/>
17+
<element name="resetButton" type="button" selector="#sales_order_create_customer_grid [data-action='grid-filter-reset']" timeout="30"/>
1718
</section>
1819
</sections>

0 commit comments

Comments
 (0)