From c01370db8df0eb82f3ebe2902ce19caa2e6eb4df Mon Sep 17 00:00:00 2001
From: David Grigoryan <david_grigoryan@epam.com>
Date: Fri, 17 Aug 2018 12:50:12 +0400
Subject: [PATCH] MAGETWO-91701: Newsletter subscription is not correctly
 updated when user is registered on 2 stores

- Updated automated test. Using Search Filter for deleting created customer.
---
 .../VerifySubscribedNewsletterDisplayedActionGroup.xml   | 9 ++++++---
 .../VerifySubscribedNewsLetterDisplayedSection.xml       | 3 +++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Newsletter/Test/Mftf/ActionGroup/VerifySubscribedNewsletterDisplayedActionGroup.xml b/app/code/Magento/Newsletter/Test/Mftf/ActionGroup/VerifySubscribedNewsletterDisplayedActionGroup.xml
index 941bcbd2d357a..b76d3e3022248 100644
--- a/app/code/Magento/Newsletter/Test/Mftf/ActionGroup/VerifySubscribedNewsletterDisplayedActionGroup.xml
+++ b/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"/>
diff --git a/app/code/Magento/Newsletter/Test/Mftf/Section/VerifySubscribedNewsLetterDisplayedSection.xml b/app/code/Magento/Newsletter/Test/Mftf/Section/VerifySubscribedNewsLetterDisplayedSection.xml
index 1af5c142e2cd7..96c3398058742 100644
--- a/app/code/Magento/Newsletter/Test/Mftf/Section/VerifySubscribedNewsLetterDisplayedSection.xml
+++ b/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>
\ No newline at end of file