From 8b184b4107110fefa7bde7623533086a3c473d03 Mon Sep 17 00:00:00 2001
From: vprohorov <vitaliy_prokharau@epam.com>
Date: Thu, 26 Jul 2018 17:33:04 +0300
Subject: [PATCH 1/2] MAGETWO-91701: Newsletter subscription is not correctly
 updated when user is registered on 2 stores

- Adding additional checking for guest customers
---
 .../Model/ResourceModel/Subscriber.php        | 41 +++++++++++--------
 1 file changed, 25 insertions(+), 16 deletions(-)

diff --git a/app/code/Magento/Newsletter/Model/ResourceModel/Subscriber.php b/app/code/Magento/Newsletter/Model/ResourceModel/Subscriber.php
index c7ce4b2f2f11b..4e059f9fe79a0 100644
--- a/app/code/Magento/Newsletter/Model/ResourceModel/Subscriber.php
+++ b/app/code/Magento/Newsletter/Model/ResourceModel/Subscriber.php
@@ -48,6 +48,13 @@ class Subscriber extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      */
     protected $mathRandom;
 
+    /**
+     * Guest customer id
+     *
+     * @var int
+     */
+    private $guestCustomerId = 0;
+
     /**
      * Construct
      *
@@ -136,22 +143,24 @@ public function loadByCustomerData(\Magento\Customer\Api\Data\CustomerInterface
             return $result;
         }
 
-        $select = $this->connection
-            ->select()
-            ->from($this->getMainTable())
-            ->where('subscriber_email=:subscriber_email and store_id=:store_id');
-
-        $result = $this->connection
-            ->fetchRow(
-                $select,
-                [
-                    'subscriber_email' => $customer->getEmail(),
-                    'store_id' => $customer->getStoreId()
-                ]
-            );
-
-        if ($result) {
-            return $result;
+        if ($customer->getId() === $this->guestCustomerId) {
+            $select = $this->connection
+                ->select()
+                ->from($this->getMainTable())
+                ->where('subscriber_email=:subscriber_email and store_id=:store_id');
+
+            $result = $this->connection
+                ->fetchRow(
+                    $select,
+                    [
+                        'subscriber_email' => $customer->getEmail(),
+                        'store_id' => $customer->getStoreId()
+                    ]
+                );
+
+            if ($result) {
+                return $result;
+            }
         }
 
         return [];

From e3a9ac2ea24ba7c2ab83ee4d1253397ce7ebf61b Mon Sep 17 00:00:00 2001
From: David Grigoryan <david_grigoryan@epam.com>
Date: Thu, 9 Aug 2018 10:57:15 +0400
Subject: [PATCH 2/2] MAGETWO-91701: Newsletter subscription is not correctly
 updated when user is registered on 2 stores

- Add automated test
---
 ...bscribedNewsletterDisplayedActionGroup.xml | 162 ++++++++++++++++++
 ...erifySubscribedNewsletterDisplayedData.xml |  23 +++
 ...fySubscribedNewsLetterDisplayedSection.xml |  80 +++++++++
 ...erifySubscribedNewsletterDisplayedTest.xml |  65 +++++++
 4 files changed, 330 insertions(+)
 create mode 100644 app/code/Magento/Newsletter/Test/Mftf/ActionGroup/VerifySubscribedNewsletterDisplayedActionGroup.xml
 create mode 100644 app/code/Magento/Newsletter/Test/Mftf/Data/VerifySubscribedNewsletterDisplayedData.xml
 create mode 100644 app/code/Magento/Newsletter/Test/Mftf/Section/VerifySubscribedNewsLetterDisplayedSection.xml
 create mode 100644 app/code/Magento/Newsletter/Test/Mftf/Test/VerifySubscribedNewsletterDisplayedTest.xml

diff --git a/app/code/Magento/Newsletter/Test/Mftf/ActionGroup/VerifySubscribedNewsletterDisplayedActionGroup.xml b/app/code/Magento/Newsletter/Test/Mftf/ActionGroup/VerifySubscribedNewsletterDisplayedActionGroup.xml
new file mode 100644
index 0000000000000..1f61e1dab9813
--- /dev/null
+++ b/app/code/Magento/Newsletter/Test/Mftf/ActionGroup/VerifySubscribedNewsletterDisplayedActionGroup.xml
@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+
+    <!--Go To Stores/All Stores-->
+    <actionGroup name="GoToAllStores">
+        <click stepKey="clickStoreItem" selector="{{Dashboard.storesItem}}"/>
+        <waitForElementVisible selector="{{Dashboard.storesAllStoresItem}}" stepKey="waitForAllStoresItemBecomeAvailable"/>
+        <click stepKey="clickAllStoreItem" selector="{{Dashboard.storesAllStoresItem}}"/>
+        <waitForPageLoad stepKey="waitForStoresPageLoaded"/>
+    </actionGroup>
+
+    <!--Create new website-->
+    <actionGroup name="AdminCreateWebsite">
+        <!--Fill required fields-->
+        <click selector="{{AdminNewWebsiteSection.addWebSite}}" stepKey="clickOnCreateWebsiteButton"/>
+        <waitForPageLoad stepKey="waitFormToBeOpened"/>
+        <fillField selector="{{AdminNewWebsiteSection.name}}" userInput="{{AdminTestData.testData}}" stepKey="enterWebsiteName" />
+        <fillField selector="{{AdminNewWebsiteSection.code}}" userInput="{{AdminTestData.testData}}" stepKey="enterWebsiteCode" />
+        <click selector="{{AdminNewWebsiteActionsSection.saveWebsite}}" stepKey="clickSaveWebsite" />
+        <waitForElementVisible selector="{{AdminStoresGridSection.websiteFilterTextField}}" stepKey="waitForStoreGridToReload"/>
+        <see userInput="You saved the website." stepKey="seeSavedMessage" />
+    </actionGroup>
+
+    <!--Create new store-->
+    <actionGroup name="AdminCreateNewStore">
+        <!--Fill required fields-->
+        <click selector="{{AdminNewStoreGroupSection.create}}" stepKey="clickOnCreateStore"/>
+        <waitForPageLoad stepKey="waitFormToBeOpened"/>
+        <selectOption selector="{{AdminNewStoreGroupSection.storeGrpWebsiteDropdown}}" userInput="{{AdminTestData.testData}}" stepKey="selectWebsite" />
+        <fillField selector="{{AdminNewStoreGroupSection.storeGrpNameTextField}}" userInput="{{AdminTestData.testData}}" stepKey="enterStoreGroupName" />
+        <fillField selector="{{AdminNewStoreGroupSection.storeGrpCodeTextField}}" userInput="{{AdminTestData.testData}}" stepKey="enterStoreGroupCode" />
+        <selectOption selector="{{AdminNewStoreGroupSection.storeRootCategoryDropdown}}" userInput="Default Category" stepKey="chooseRootCategory" />
+        <click selector="{{AdminStoreGroupActionsSection.saveButton}}" stepKey="clickSaveStoreGroup" />
+        <waitForElementVisible selector="{{AdminStoresGridSection.storeGrpFilterTextField}}" stepKey="waitForStoreGridReload"/>
+        <see userInput="You saved the store." stepKey="seeSavedMessage" />
+    </actionGroup>
+
+    <!--Create store view-->
+    <actionGroup name="AdminCreateStoreView">
+        <!--Fill required fields-->
+        <click selector="{{AdminNewStoreSection.create}}" stepKey="clickOnCreateStoreView"/>
+        <waitForPageLoad stepKey="waitFormToBeOpened"/>
+        <selectOption selector="{{AdminNewStoreSection.storeGrpDropdown}}" userInput="{{AdminTestData.testData}}" stepKey="selectStore" />
+        <fillField selector="{{AdminNewStoreSection.storeNameTextField}}" userInput="{{AdminTestData.testData}}" stepKey="enterStoreViewName" />
+        <fillField selector="{{AdminNewStoreSection.storeCodeTextField}}" userInput="{{AdminTestData.testData}}" stepKey="enterStoreViewCode" />
+        <selectOption selector="{{AdminNewStoreSection.statusDropdown}}" userInput="Enabled" stepKey="setStatus" />
+        <click selector="{{AdminNewStoreViewActionsSection.saveButton}}" stepKey="clickSaveStoreView" />
+        <waitForElementVisible selector="{{AdminConfirmationModalSection.ok}}" stepKey="waitForModal" />
+        <see selector="{{AdminConfirmationModalSection.title}}" userInput="Warning message" stepKey="seeWarning" />
+        <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="dismissModal" />
+        <waitForElementVisible selector="{{AdminStoresGridSection.storeFilterTextField}}" stepKey="waitForPageReolad"/>
+        <waitForElementVisible selector="{{AdminStoresGridSection.storeFilterTextField}}" stepKey="waitForPageReload"/>
+        <see userInput="You saved the store view." stepKey="seeSavedMessage" />
+    </actionGroup>
+
+    <!--Go to Stores -> Configuration -> Web.-->
+    <actionGroup name="GoToStoresConfigurationWeb">
+        <click stepKey="againClickStoreItem" selector="{{Dashboard.storesItem}}"/>
+        <waitForElementVisible selector="{{Dashboard.storesConfigurationItem}}" stepKey="waitForAllStoreItemExtends"/>
+        <click stepKey="clickConfigurationItem" selector="{{Dashboard.storesConfigurationItem}}"/>
+        <waitForPageLoad stepKey="waitForStoresConfigurationPageLoaded"/>
+        <click stepKey="clickWebItem" selector="{{AdminStoresConfigurationSection.webItem}}"/>
+        <waitForPageLoad stepKey="waitForStoresConfigurationWebPageLoaded"/>
+    </actionGroup>
+
+    <!--Select Yes in Add Store Code to Urls field.-->
+    <actionGroup name="SelectYesInAddStoreCodeToUrlsField">
+        <click stepKey="clickOpenUrlOptions" selector="{{AdminStoresConfigurationSection.openUrlOptions}}"/>
+        <click stepKey="clickUseSystemValueCheckbox" selector="{{AdminStoresConfigurationSection.useSystemValueCheckbox}}"/>
+        <selectOption selector="{{AdminStoresConfigurationSection.addStoreCodeToUrlsDropDown}}" userInput="Yes" stepKey="setAddStoreCodeToUrlsYes" />
+        <click stepKey="clickSaveConfigButton" selector="{{AdminStoresConfigurationSection.saveConfigButton}}"/>
+        <waitForPageLoad stepKey="waitForSaveConfig"/>
+        <see stepKey="seeSavedConfigurationMessage" userInput="You saved the configuration."/>
+    </actionGroup>
+
+    <!--Create an Account. Check Sign Up for Newsletter checkbox -->
+    <actionGroup name="StorefrontCreateNewAccount">
+        <fillField selector="{{StorefrontCustomerCreateFormSection.firstNameField}}" userInput="{{CreateUserData.firstName}}" stepKey="enterFirstName" />
+        <fillField selector="{{StorefrontCustomerCreateFormSection.lastNameField}}" userInput="{{CreateUserData.lastName}}" stepKey="enterLastName" />
+        <click selector="{{StorefrontCustomerCreateFormSection.signUpForNewsletter}}" stepKey="selectSignUpForNewsletterCheckbox"/>
+        <fillField selector="{{StorefrontCustomerCreateFormSection.emailField}}" userInput="{{CreateUserData.firstName}}@magento.com" stepKey="enterEmail" />
+        <fillField selector="{{StorefrontCustomerCreateFormSection.passwordField}}" userInput="{{CreateUserData.password}}" stepKey="enterPassword" />
+        <fillField selector="{{StorefrontCustomerCreateFormSection.confirmPasswordField}}" userInput="{{CreateUserData.password}}" stepKey="confirmPassword" />
+        <click stepKey="clickCreateAccountButton" selector="{{StorefrontCustomerCreateFormSection.createAccountButton}}"/>
+        <waitForPageLoad stepKey="waitForMyAccountPageLoad"/>
+    </actionGroup>
+
+    <!-- Sign out -->
+    <actionGroup name="StorefrontSignOut">
+        <click stepKey="clickCustomerNameItem" selector="{{CustomerMyAccountPage.customerName}}"/>
+        <click stepKey="clickSignOutButton" selector="{{CustomerMyAccountPage.customerSignOut}}"/>
+        <waitForPageLoad stepKey="waitForSignOut"/>
+    </actionGroup>
+
+    <!--Create an Account. Uncheck Sign Up for Newsletter checkbox -->
+    <actionGroup name="StorefrontCreateNewAccountNewsletterUnchecked">
+        <click stepKey="clickCreateNewAccountButton" selector="{{CustomerMyAccountPage.createNewAccount}}"/>
+        <waitForPageLoad stepKey="waitForCreateNewAccountPageLoaded"/>
+        <fillField selector="{{StorefrontCustomerCreateFormSection.firstNameField}}" userInput="{{CreateUserData.firstName}}" stepKey="enterFirstName" />
+        <fillField selector="{{StorefrontCustomerCreateFormSection.lastNameField}}" userInput="{{CreateUserData.lastName}}" stepKey="enterLastName" />
+        <fillField selector="{{StorefrontCustomerCreateFormSection.emailField}}" userInput="{{CreateUserData.firstName}}@magento.com" stepKey="enterEmail" />
+        <fillField selector="{{StorefrontCustomerCreateFormSection.passwordField}}" userInput="{{CreateUserData.password}}" stepKey="enterPassword" />
+        <fillField selector="{{StorefrontCustomerCreateFormSection.confirmPasswordField}}" userInput="{{CreateUserData.password}}" stepKey="confirmPassword" />
+        <click stepKey="clickCreateAccountButton" selector="{{StorefrontCustomerCreateFormSection.createAccountButton}}"/>
+        <waitForPageLoad stepKey="waitForMyAccountPageLoad"/>
+        <see userInput="Thank you for registering with" stepKey="seeValidRegistrationMessage"/>
+    </actionGroup>
+
+    <!--Delete created Website -->
+    <actionGroup name="AdminDeleteWebsite">
+        <fillField stepKey="fillSearchWebsiteField" selector="{{AdminStoresGridSection.websiteFilterTextField}}" userInput="{{AdminTestData.testData}}"/>
+        <click stepKey="clickSearchButton" selector="{{AdminStoresGridSection.searchButton}}"/>
+        <see stepKey="verifyThatCorrectWebsiteFound" selector="{{AdminStoresGridSection.websiteNameInFirstRow}}" userInput="{{AdminTestData.testData}}"/>
+        <click stepKey="clickEditExistingStoreRow" selector="{{AdminStoresGridSection.websiteNameInFirstRow}}"/>
+        <waitForPageLoad stepKey="waitForStoreToLoad"/>
+        <click stepKey="clickDeleteWebsiteButtonOnEditWebsitePage" selector="{{AdminStoresMainActionsSection.deleteButton}}"/>
+        <selectOption stepKey="setCreateDbBackupToNo" selector="{{AdminStoresDeleteStoreGroupSection.createDbBackup}}" userInput="No"/>
+        <click stepKey="clickDeleteWebsiteButton" selector="{{AdminStoresDeleteStoreGroupSection.deleteStoreGroupButton}}"/>
+        <waitForElementVisible stepKey="waitForStoreGridToReload" selector="{{AdminStoresGridSection.websiteFilterTextField}}"/>
+        <see stepKey="seeSavedMessage" userInput="You deleted the website."/>
+    </actionGroup>
+
+    <!--Set Default config -->
+    <actionGroup name="AdminSetDefaultConfig">
+        <selectOption selector="{{AdminStoresConfigurationSection.addStoreCodeToUrlsDropDown}}" userInput="No" stepKey="setAddStoreCodeToUrlsNo" />
+        <click stepKey="disableUseSystemValueCheckbox" selector="{{AdminStoresConfigurationSection.useSystemValueCheckbox}}"/>
+        <click stepKey="clickDefaultConfigSaveButton" selector="{{AdminStoresConfigurationSection.saveConfigButton}}"/>
+        <waitForPageLoad stepKey="waitForSaveConfig"/>
+        <see stepKey="saveDefaultConfig" userInput="You saved the configuration."/>
+        <click stepKey="clickOpenUrlOptions" selector="{{AdminStoresConfigurationSection.openUrlOptions}}"/>
+    </actionGroup>
+
+    <!--Delete created Customer -->
+    <actionGroup name="AdminDeleteCreatedCustomer">
+        <click stepKey="clickCustomerItem" selector="{{Dashboard.customer}}"/>
+        <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}}"/>
+        <click selector="{{AdminCustomerAccountInformationSection.selectCustomer}}" stepKey="ClickOnCustomer"/>
+        <click selector="{{AdminCustomerAccountInformationSection.actions}}" stepKey="ClickOnActions"/>
+        <waitForElementVisible selector="{{AdminCustomerAccountInformationSection.delete}}" stepKey="waitForDeleteButtonAppeared"/>
+        <click selector="{{AdminCustomerAccountInformationSection.delete}}" stepKey="ClickOnDelete"/>
+        <waitForElementVisible selector="{{AdminCustomerAccountInformationSection.confirm}}" stepKey="waitForConfirmButtonAppeared"/>
+        <click selector="{{AdminCustomerAccountInformationSection.confirm}}" stepKey="ClickToConfirm"/>
+        <waitForPageLoad stepKey="waitClickToConfirmButton"/>
+        <see stepKey="seeRecordsWereDeletedMessage" userInput="A total of 2 record(s) were deleted."/>
+        <click stepKey="clickClearAllFilterButton" selector="{{AdminCustomerAccountInformationSection.clearAll}}"/>
+        <!-- We need this wait to make sure that Active filters is clear (waitForElementNotVisible tag doesn't wait until clearing filters)-->
+        <wait stepKey="waitToClearAllFilters" time="2"/>
+    </actionGroup>
+
+</actionGroups>
diff --git a/app/code/Magento/Newsletter/Test/Mftf/Data/VerifySubscribedNewsletterDisplayedData.xml b/app/code/Magento/Newsletter/Test/Mftf/Data/VerifySubscribedNewsletterDisplayedData.xml
new file mode 100644
index 0000000000000..4082626cef5a7
--- /dev/null
+++ b/app/code/Magento/Newsletter/Test/Mftf/Data/VerifySubscribedNewsletterDisplayedData.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+
+    <!-- For this Test, all data is the same. -->
+    <entity name="AdminTestData" type="data">
+        <data key="testData" unique="suffix">store2</data>
+    </entity>
+
+    <entity name="CreateUserData" type="user">
+        <data key="firstName" unique="suffix">John</data>
+        <data key="lastName">Smith</data>
+        <data key="password">Admin@123</data>
+    </entity>
+
+</entities>
\ No newline at end of file
diff --git a/app/code/Magento/Newsletter/Test/Mftf/Section/VerifySubscribedNewsLetterDisplayedSection.xml b/app/code/Magento/Newsletter/Test/Mftf/Section/VerifySubscribedNewsLetterDisplayedSection.xml
new file mode 100644
index 0000000000000..1af5c142e2cd7
--- /dev/null
+++ b/app/code/Magento/Newsletter/Test/Mftf/Section/VerifySubscribedNewsLetterDisplayedSection.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+
+    <section name="Dashboard">
+        <element name="storesItem" type="button" selector="#menu-magento-backend-stores"/>
+        <element name="storesAllStoresItem" type="button" selector="//*[@data-ui-id='menu-magento-backend-system-store']/a/span"/>
+        <element name="storesConfigurationItem" type="button" selector="//*[@data-ui-id='menu-magento-config-system-config']/a/span"/>
+        <element name="customerAllCustomer" type="button" selector="//*[@data-ui-id='menu-magento-customer-customer-manage']"/>
+        <element name="customer" type="button" selector="#menu-magento-customer-customer"/>
+    </section>
+
+    <section name="AdminNewWebsiteSection">
+        <element name="stores" type="button" selector="#menu-magento-backend-stores"/>
+        <element name="allStores" type="button" selector="//span[contains(text(), 'All Stores')]"/>
+        <element name="addWebSite" type="button" selector="#add"/>
+        <element name="name" type="input" selector="#website_name"/>
+        <element name="code" type="input" selector="#website_code"/>
+    </section>
+
+    <section name="AdminNewStoreGroupSection">
+        <element name="create" type="button" selector="#add_group"/>
+        <element name="storeGrpWebsiteDropdown" type="select" selector="#group_website_id"/>
+        <element name="storeGrpNameTextField" type="input" selector="#group_name"/>
+        <element name="storeGrpCodeTextField" type="input" selector="#group_code"/>
+        <element name="storeRootCategoryDropdown" type="select" selector="#group_root_category_id"/>
+    </section>
+
+    <section name="AdminNewStoreSection">
+        <element name="create" type="button" selector="#add_store"/>
+        <element name="storeNameTextField" type="input" selector="#store_name"/>
+        <element name="storeCodeTextField" type="input" selector="#store_code"/>
+        <element name="statusDropdown" type="select" selector="#store_is_active"/>
+        <element name="storeGrpDropdown" type="select" selector="#store_group_id"/>
+        <element name="sortOrderTextField" type="input" selector="#store_sort_order"/>
+        <element name="acceptNewStoreViewCreation" type="button" selector=".action-primary.action-accept" />
+    </section>
+
+    <section name="AdminStoresConfigurationSection">
+        <element name="openUrlOptions" type="button" selector="#web_url-head"/>
+        <element name="webItem" type="button" selector="//*[@id='system_config_tabs']/div[1]//span[contains(text(), 'Web')]"/>
+        <element name="useSystemValueCheckbox" type="checkbox" selector="#web_url_use_store_inherit"/>
+        <element name="addStoreCodeToUrlsDropDown" type="select" selector="#web_url_use_store"/>
+        <element name="saveConfigButton" type="button" selector="#save"/>
+    </section>
+
+    <section name="StorefrontCustomerCreateFormSection">
+        <element name="firstNameField" type="input" selector="#firstname"/>
+        <element name="lastNameField" type="input" selector="#lastname"/>
+        <element name="emailField" type="input" selector="#email_address"/>
+        <element name="passwordField" type="input" selector="#password"/>
+        <element name="confirmPasswordField" type="input" selector="#password-confirmation"/>
+        <element name="createAccountButton" type="button" selector="button.action.submit.primary" timeout="30"/>
+        <element name="signUpForNewsletter" type="checkbox" selector="//span[contains(text(), 'Sign Up for Newsletter')]"/>
+    </section>
+
+    <section name="CustomerMyAccountPage">
+        <element name="createNewAccount" type="button" selector="//*[@class='page-header']//a[contains(text(),'Create an Account')]"/>
+        <element name="customerName" type="button" selector="//*[@class='customer-welcome']//span[@class='customer-name']/button[@data-action='customer-menu-toggle']"/>
+        <element name="customerSignOut" type="button" selector="//*[@class='customer-menu']//*[normalize-space()='Sign Out']"/>
+    </section>
+
+    <section name="AdminCustomerAccountInformationSection">
+        <element name="searchToKeyword" type="input" selector="//*[@class='admin__data-grid-outer-wrap']/*[@class='admin__data-grid-header']//*[@class='data-grid-search-control-wrap']/input"/>
+        <element name="searchButton" type="button" selector="//*[@class='admin__data-grid-outer-wrap']/*[@class='admin__data-grid-header']//*[@class='data-grid-search-control-wrap']/button"/>
+        <element name="selectCustomer" type="checkbox" selector="//*[@class='admin__data-grid-wrap' and @data-role='grid-wrapper']//*[@class='data-grid-multicheck-cell']/div/label"/>
+        <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="clearAll" type="button" selector="//*[@class='admin__data-grid-outer-wrap']/*[@class='admin__data-grid-header']//*[contains(text(), 'Clear all')]"/>
+    </section>
+
+</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Newsletter/Test/Mftf/Test/VerifySubscribedNewsletterDisplayedTest.xml b/app/code/Magento/Newsletter/Test/Mftf/Test/VerifySubscribedNewsletterDisplayedTest.xml
new file mode 100644
index 0000000000000..78c4e2085cc86
--- /dev/null
+++ b/app/code/Magento/Newsletter/Test/Mftf/Test/VerifySubscribedNewsletterDisplayedTest.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+    <test name="VerifySubscribedNewsletterDisplayedTest">
+        <annotations>
+            <features value="Newsletter"/>
+            <stories value="MAGETWO-91701: Newsletter subscription is not correctly updated when user is registered on 2 stores"/>
+            <group value="Newsletter"/>
+            <title value="Newsletter subscription when user is registered on 2 stores"/>
+            <description value="Newsletter subscription when user is registered on 2 stores"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-93836"/>
+        </annotations>
+
+        <before>
+            <!--Log in to Magento as admin.-->
+            <actionGroup ref="LoginActionGroup" stepKey="login"/>
+            <!--Go to Stores.-->
+            <actionGroup ref="GoToAllStores" stepKey="goToAllStores"/>
+            <!--Create Website.-->
+            <actionGroup ref="AdminCreateWebsite" stepKey="adminCreateWebsite"/>
+            <!--Create Store.-->
+            <actionGroup ref="AdminCreateNewStore" stepKey="adminCreateNewStore"/>
+            <!--Create Store View.-->
+            <actionGroup ref="AdminCreateStoreView" stepKey="adminCreateStoreView"/>
+            <!--Go to Stores -> Configuration -> Web.-->
+            <actionGroup ref="GoToStoresConfigurationWeb" stepKey="goToStoresConfigurationWeb"/>
+            <actionGroup ref="SelectYesInAddStoreCodeToUrlsField" stepKey="selectYesInAddStoreCodeToUrlsField"/>
+        </before>
+
+        <!--Go to store front (default) and click Create an Account.-->
+        <amOnPage url="{{StorefrontCustomerCreatePage.url}}" stepKey="navigateToCustomers"/>
+        <actionGroup ref="StorefrontCreateNewAccount" stepKey="createNewAccount"/>
+
+        <!--Sign Out-->
+        <actionGroup ref="StorefrontSignOut" stepKey="storefrontSignOut"/>
+
+        <!--Change 'default' to 'url_name' in url-->
+        <amOnPage url="{{AdminTestData.testData}}" stepKey="goToCreatedWebPage"/>
+        <waitForPageLoad stepKey="waitForCreatedWebPageLoaded"/>
+
+        <!--Create new Account with the same email address. (unchecked Sign Up for Newsletter checkbox)-->
+        <actionGroup ref="StorefrontCreateNewAccountNewsletterUnchecked" stepKey="createNewAccountNewsletterUnchecked"/>
+        <dontSee stepKey="verifySubscribedNewsletters" userInput="You aren't subscribed to our newsletter displayed"/>
+
+        <after>
+            <!--Delete created data and set Default Configuration-->
+            <amOnPage url="admin" stepKey="goToAdminPage"/>
+            <waitForPageLoad stepKey="waitForAdminPageLoaded"/>
+            <actionGroup ref="AdminDeleteCreatedCustomer" stepKey="adminDeleteCustomer"/>
+            <actionGroup ref="GoToAllStores" stepKey="goToAllStores"/>
+            <actionGroup ref="AdminDeleteWebsite" stepKey="adminDeleteWebsite"/>
+            <actionGroup ref="GoToStoresConfigurationWeb" stepKey="goToStoresConfigurationWeb"/>
+            <actionGroup ref="AdminSetDefaultConfig" stepKey="adminSetDefaultConfig"/>
+        </after>
+
+    </test>
+</tests>
+