diff --git a/app/code/Magento/Customer/Block/Account/Dashboard/Info.php b/app/code/Magento/Customer/Block/Account/Dashboard/Info.php index ded7238edc755..87132c3afb8bc 100644 --- a/app/code/Magento/Customer/Block/Account/Dashboard/Info.php +++ b/app/code/Magento/Customer/Block/Account/Dashboard/Info.php @@ -102,7 +102,7 @@ public function getSubscriptionObject() $this->_subscription = $this->_createSubscriber(); $customer = $this->getCustomer(); if ($customer) { - $this->_subscription->loadByEmail($customer->getEmail()); + $this->_subscription->loadByCustomerId($customer->getId()); } } return $this->_subscription; diff --git a/app/code/Magento/Newsletter/Test/Mftf/ActionGroup/VerifySubscribedNewsletterDisplayedActionGroup.xml b/app/code/Magento/Newsletter/Test/Mftf/ActionGroup/VerifySubscribedNewsletterDisplayedActionGroup.xml index b76d3e3022248..92d17e9d71e2f 100644 --- a/app/code/Magento/Newsletter/Test/Mftf/ActionGroup/VerifySubscribedNewsletterDisplayedActionGroup.xml +++ b/app/code/Magento/Newsletter/Test/Mftf/ActionGroup/VerifySubscribedNewsletterDisplayedActionGroup.xml @@ -8,158 +8,24 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + diff --git a/app/code/Magento/Newsletter/Test/Mftf/Data/VerifySubscribedNewsletterDisplayedData.xml b/app/code/Magento/Newsletter/Test/Mftf/Data/VerifySubscribedNewsletterDisplayedData.xml deleted file mode 100644 index 4082626cef5a7..0000000000000 --- a/app/code/Magento/Newsletter/Test/Mftf/Data/VerifySubscribedNewsletterDisplayedData.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - store2 - - - - John - Smith - Admin@123 - - - \ 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 index 96c3398058742..06f762900436e 100644 --- a/app/code/Magento/Newsletter/Test/Mftf/Section/VerifySubscribedNewsLetterDisplayedSection.xml +++ b/app/code/Magento/Newsletter/Test/Mftf/Section/VerifySubscribedNewsLetterDisplayedSection.xml @@ -9,75 +9,12 @@ -
- - - - - -
- -
- - - - - -
- -
- - - - - -
- -
- - - - - - - -
- -
- - - - - -
-
- - - - - -
- - - -
- -
- - - - - - - - - - +
\ 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 index ad223381deadc..faed8b1af952e 100644 --- a/app/code/Magento/Newsletter/Test/Mftf/Test/VerifySubscribedNewsletterDisplayedTest.xml +++ b/app/code/Magento/Newsletter/Test/Mftf/Test/VerifySubscribedNewsletterDisplayedTest.xml @@ -20,46 +20,47 @@ - - - - - - - - - - - - - - - - - - - - + + + + + - - - + + + + + - - - + + + + + + + - - - - - - - + + + + + + + + + + + + + + + + +