Merge pull request #68 from magento-epam/MAGETWO-62891

MAGETWO-62891: New address is not marked as "Default Billing"
magento · Aug 17, 2018 · e09ec2d · e09ec2d
2 parents 5191b90 + 2d1a4d1
commit e09ec2d
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 8 deletions.
diff --git a/.../Checkout/Test/Mftf/ActionGroup/IdentityOfDefaultBillingAndShippingAddressActionGroup.xml b/.../Checkout/Test/Mftf/ActionGroup/IdentityOfDefaultBillingAndShippingAddressActionGroup.xml
@@ -38,12 +38,12 @@
     <actionGroup name="StorefrontCreateAccountActionGroup">
         <click selector="{{StorefrontCreateAccountSection.createAccount}}" stepKey="ClickToCreateAccount"/>
         <waitForPageLoad stepKey="waitForAccountFormIsOpened"/>
-        <fillField selector="{{StorefrontCreateAccountSection.firstName}}" userInput="{{CreateUserData.firstName}}" stepKey="TypeFirstName"/>
-        <fillField selector="{{StorefrontCreateAccountSection.lastName}}" userInput="{{CreateUserData.lastName}}" stepKey="TypeLastName"/>
-        <fillField selector="{{StorefrontCreateAccountSection.email}}" userInput="{{CreateUserData.firstName}}@magento.com" stepKey="TypeEmail"/>
-        <fillField selector="{{StorefrontCreateAccountSection.password}}" userInput="{{CreateUserData.password}}" stepKey="TypePassword"/>
+        <fillField selector="{{StorefrontCreateAccountSection.firstName}}" userInput="{{CreateNewUserData.firstName}}" stepKey="TypeFirstName"/>
+        <fillField selector="{{StorefrontCreateAccountSection.lastName}}" userInput="{{CreateNewUserData.lastName}}" stepKey="TypeLastName"/>
+        <fillField selector="{{StorefrontCreateAccountSection.email}}" userInput="{{CreateNewUserData.firstName}}@magento.com" stepKey="TypeEmail"/>
+        <fillField selector="{{StorefrontCreateAccountSection.password}}" userInput="{{CreateNewUserData.password}}" stepKey="TypePassword"/>
         <waitForPageLoad stepKey="waitToConfirmPassword"/>
-        <fillField selector="{{StorefrontCreateAccountSection.confirmPass}}" userInput="{{CreateUserData.password}}" stepKey="confirmPassword"/>
+        <fillField selector="{{StorefrontCreateAccountSection.confirmPass}}" userInput="{{CreateNewUserData.password}}" stepKey="confirmPassword"/>
         <click selector="{{StorefrontCreateAccountSection.create}}" stepKey="ClickToSaveAccount"/>
         <waitForPageLoad stepKey="waitForAccountPageLoaded"/>
     </actionGroup>
@@ -129,9 +129,12 @@
         <wait stepKey="WaitForCustomerViewOpened" time="2"/>
         <click stepKey="clickCustomerAllCustomerItem" selector="{{DashboardSection.customerAllCustomer}}"/>
         <waitForPageLoad stepKey="WaitForCustomerPageIsLoaded"/>
-        <fillField stepKey="searchToKeyword" selector="{{AdminCustomerAccInformationSection.searchToKeyword}}" userInput="{{CreateUserData.firstName}}"/>
-        <click stepKey="clickSearchButton" selector="{{AdminCustomerAccInformationSection.searchButton}}"/>
-        <waitForElementVisible stepKey="waitForFiltering" selector="{{AdminCustomerAccInformationSection.selectCustomer}}"/>
+        <conditionalClick selector="{{AdminCustomerAccInformationSection.clearAll}}" dependentSelector="{{AdminCustomerAccInformationSection.clearAll}}" visible="1" stepKey="clickClearAllIfThereIsAnyValue"/>
+        <click stepKey="clickFilterButton" selector="{{AdminCustomerAccInformationSection.filterButton}}"/>
+        <waitForElementVisible selector="{{AdminCustomerAccInformationSection.filterNameField}}" stepKey="waitForFilterDataLoaded"/>
+        <fillField stepKey="searchProductUsingNameField" selector="{{AdminCustomerAccInformationSection.filterNameField}}" userInput="{{CreateNewUserData.firstName}}"/>
+        <click stepKey="clickFiltersApplyButton" selector="{{AdminCustomerAccInformationSection.filtersApplyButton}}"/>
+        <waitForElementNotVisible selector="{{AdminCustomerAccInformationSection.filterNameField}}" stepKey="waitForFilterBecomeNotVisible"/>
         <click selector="{{AdminCustomerAccInformationSection.selectCustomer}}" stepKey="ClickOnCustomer"/>
         <click selector="{{AdminCustomerAccInformationSection.actions}}" stepKey="ClickOnActions"/>
         <waitForElementVisible selector="{{AdminCustomerAccInformationSection.delete}}" stepKey="waitForDeleteButtonAppeared"/>

diff --git a/app/code/Magento/Checkout/Test/Mftf/Data/IdentityOfDefaultBillingAndShippingAddressData.xml b/app/code/Magento/Checkout/Test/Mftf/Data/IdentityOfDefaultBillingAndShippingAddressData.xml
@@ -23,4 +23,10 @@
         <data key="telephone">222222222</data>
     </entity>
 
+    <entity name="CreateNewUserData" type="user">
+        <data key="firstName" unique="suffix">John</data>
+        <data key="lastName">Smith</data>
+        <data key="password">Admin@123</data>
+    </entity>
+
 </entities>
diff --git a/.../Magento/Checkout/Test/Mftf/Section/IdentityOfDefaultBillingAndShippingAddressSection.xml b/.../Magento/Checkout/Test/Mftf/Section/IdentityOfDefaultBillingAndShippingAddressSection.xml
@@ -89,6 +89,10 @@
         <element name="actions" type="button" selector="//div[@class='admin__data-grid-header']//div[@class='col-xs-2']//span[text()='Actions']"/>
         <element name="delete" type="button" selector="//div[@class='col-xs-2']//span[text()='Delete']"/>
         <element name="confirm" type="button" selector=".action-primary.action-accept"/>
+        <element name="filterButton" type="button" selector="//*[@class='admin__data-grid-outer-wrap']/*[@class='admin__data-grid-header']//*[@class='data-grid-filters-action-wrap']/button"/>
+        <element name="filterNameField" type="input" selector="//*[@name='name']"/>
+        <element name="filtersApplyButton" type="button" selector="//*[contains(text(),'Apply Filters')]"/>
+        <element name="clearAll" type="button" selector="//*[@class='admin__data-grid-outer-wrap']/*[@class='admin__data-grid-header']//*[contains(text(), 'Clear all')]"/>
     </section>
 
 </sections>