Skip to content

Commit 042d75f

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

File tree

2 files changed

+2
-15
lines changed

2 files changed

+2
-15
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
<after>
2525
<createData entity="DisableAdminAccountAllowCountry" stepKey="setDefaultValueForAllowCountries"/>
2626
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
27-
<actionGroup ref="DeleteCustomerAdminActionGroup" stepKey="deleteCustomer">
28-
<argument name="customer" value="CustomerEntityOne"/>
27+
<actionGroup ref="AdminDeleteCustomerActionGroup" stepKey="deleteCustomer">
28+
<argument name="customerEmail" value="CustomerEntityOne.email"/>
2929
</actionGroup>
3030
<actionGroup ref="AdminClearCustomersFiltersActionGroup" stepKey="clearFilters"/>
3131
<waitForPageLoad stepKey="WaitForPageToLoad"/>

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

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -35,21 +35,8 @@
3535
<click selector="{{AdminCustomerGridMainActionsSection.delete}}" stepKey="clickDelete"/>
3636
<waitForAjaxLoad stepKey="waitForLoadConfirmation"/>
3737
<click selector="{{AdminConfirmationModalSection.ok}}" stepKey="confirmDelete"/>
38-
<wait time="5" stepKey="aaa"/>
3938
<see selector="{{AdminMessagesSection.successMessage}}" userInput="A total of 1 record(s) were deleted" stepKey="seeSuccess"/>
4039
</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-
5340
<actionGroup name="AdminClearCustomersFiltersActionGroup">
5441
<amOnPage url="{{AdminCustomerPage.url}}" stepKey="amOnCustomersPage"/>
5542
<waitForPageLoad stepKey="WaitForPageToLoad"/>

0 commit comments

Comments
 (0)