Skip to content

Commit 2cab2ec

Browse files
committed
MAGETWO-96107: Additional blank option in country dropdown
- Added some corrections based on comments
1 parent 43e80e7 commit 2cab2ec

File tree

2 files changed

+19
-1
lines changed

2 files changed

+19
-1
lines changed

app/code/Magento/Config/Test/Mftf/Test/CheckingCountryDropDownWithOneAllowedCountryTest.xml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,16 @@
1919
<group value="configuration"/>
2020
</annotations>
2121
<before>
22-
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
2322
<createData entity="EnableAdminAccountAllowCountry" stepKey="setAllowedCountries"/>
2423
</before>
2524
<after>
2625
<createData entity="DisableAdminAccountAllowCountry" stepKey="setDefaultValueForAllowCountries"/>
26+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
27+
<actionGroup ref="DeleteCustomerAdminActionGroup" stepKey="deleteCustomer">
28+
<argument name="customer" value="CustomerEntityOne"/>
29+
</actionGroup>
30+
<actionGroup ref="AdminClearCustomersFiltersActionGroup" stepKey="clearFilters"/>
31+
<waitForPageLoad stepKey="WaitForPageToLoad"/>
2732
<actionGroup ref="logout" stepKey="logout"/>
2833
</after>
2934
<!--Flush Magento Cache-->

app/code/Magento/Customer/Test/Mftf/ActionGroup/OpenEditCustomerFromAdminActionGroup.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,21 @@
3535
<click selector="{{AdminCustomerGridMainActionsSection.delete}}" stepKey="clickDelete"/>
3636
<waitForAjaxLoad stepKey="waitForLoadConfirmation"/>
3737
<click selector="{{AdminConfirmationModalSection.ok}}" stepKey="confirmDelete"/>
38+
<wait time="5" stepKey="aaa"/>
3839
<see selector="{{AdminMessagesSection.successMessage}}" userInput="A total of 1 record(s) were deleted" stepKey="seeSuccess"/>
3940
</actionGroup>
41+
42+
<actionGroup name="DeleteCustomerAdminActionGroup" extends="DeleteCustomerFromAdminActionGroup">
43+
<arguments>
44+
<argument name="customer"/>
45+
</arguments>
46+
<remove keyForRemoval="fillSearch"/>
47+
<remove keyForRemoval="clickSubmit"/>
48+
<click selector="{{AdminDataGridHeaderSection.filters}}" stepKey="openFiltersSectionOnCustomerPage" after="clickOnButtonToRemoveFiltersIfPresent"/>
49+
<fillField userInput="{{customer.email}}" selector="{{AdminDataGridHeaderSection.filterFieldInput('email')}}" stepKey="fillEmailOnFiltersSection" after="openFiltersSectionOnCustomerPage"/>
50+
<click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickApplyFiltersButton" after="fillEmailOnFiltersSection"/>
51+
</actionGroup>
52+
4053
<actionGroup name="AdminClearCustomersFiltersActionGroup">
4154
<amOnPage url="{{AdminCustomerPage.url}}" stepKey="amOnCustomersPage"/>
4255
<waitForPageLoad stepKey="WaitForPageToLoad"/>

0 commit comments

Comments
 (0)