Merge pull request #61 from magento-epam/MAGETWO-91701-V2

MAGETWO-91701: Newsletter subscription is not correctly updated when …

Author: nikshostko

app/code/Magento/Newsletter/Test/Mftf/ActionGroup/VerifySubscribedNewsletterDisplayedActionGroup.xml

@@ -143,9 +143,12 @@
         <wait stepKey="WaitForCustomerViewOpened" time="2"/>
         <click stepKey="clickCustomerAllCustomerItem" selector="{{Dashboard.customerAllCustomer}}"/>
         <waitForPageLoad stepKey="WaitForCustomerPageIsLoaded"/>
-        <fillField stepKey="searchToKeyword" selector="{{AdminCustomerAccountInformationSection.searchToKeyword}}" userInput="{{CreateUserData.firstName}}"/>
-        <click stepKey="clickSearchButton" selector="{{AdminCustomerAccountInformationSection.searchButton}}"/>
-        <waitForElementVisible stepKey="waitForFiltering" selector="{{AdminCustomerAccountInformationSection.selectCustomer}}"/>
+        <conditionalClick selector="{{AdminCustomerAccountInformationSection.clearAll}}" dependentSelector="{{AdminCustomerAccountInformationSection.clearAll}}" visible="1" stepKey="clickClearAllIfThereIsAnyValue"/>
+        <click stepKey="clickFilterButton" selector="{{AdminCustomerAccountInformationSection.filterButton}}"/>
+        <waitForElementVisible selector="{{AdminCustomerAccountInformationSection.filterNameField}}" stepKey="waitForFilterDataLoaded"/>
+        <fillField stepKey="searchProductUsingNameField" selector="{{AdminCustomerAccountInformationSection.filterNameField}}" userInput="{{CreateUserData.firstName}}"/>
+        <click stepKey="clickFiltersApplyButton" selector="{{AdminCustomerAccountInformationSection.filtersApplyButton}}"/>
+        <waitForElementNotVisible selector="{{AdminCustomerAccountInformationSection.filterNameField}}" stepKey="waitForFilterBecomeNotVisible"/>
         <click selector="{{AdminCustomerAccountInformationSection.selectCustomer}}" stepKey="ClickOnCustomer"/>
         <click selector="{{AdminCustomerAccountInformationSection.actions}}" stepKey="ClickOnActions"/>
         <waitForElementVisible selector="{{AdminCustomerAccountInformationSection.delete}}" stepKey="waitForDeleteButtonAppeared"/>

app/code/Magento/Newsletter/Test/Mftf/Section/VerifySubscribedNewsLetterDisplayedSection.xml

@@ -75,6 +75,9 @@
         <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="clearAll" type="button" selector="//*[@class='admin__data-grid-outer-wrap']/*[@class='admin__data-grid-header']//*[contains(text(), 'Clear all')]"/>
+        <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')]"/>
     </section>
 
 </sections>