From a5cb59a7cefc789d39825469f62f58ded19a3524 Mon Sep 17 00:00:00 2001
From: Michiel De Smet <mdesmet@gmail.com>
Date: Thu, 18 Apr 2019 00:47:41 +0200
Subject: [PATCH 1/7] newsletter module

---
 .gitignore                                    |  1 +
 config/default.json                           |  2 +-
 .../blocks/MyAccount/MyNewsletter.js          | 34 +---------
 .../newsletter/components/Newsletter.ts       |  8 +++
 .../modules/newsletter}/index.ts              |  6 +-
 .../modules/newsletter/mixins}/Subscribe.ts   | 15 ++---
 .../newsletter/mixins/SubscriptionStatus.ts   | 63 +++++++++++++++++++
 core/modules/newsletter/mixins/Unsubscribe.ts | 28 +++++++++
 .../modules/newsletter}/store/index.ts        | 38 +++++++++--
 .../newsletter}/store/mutation-types.ts       |  0
 .../newsletter/types/newsletterState.ts       |  4 +-
 core/scripts/installer.js                     |  2 +-
 core/store/index.ts                           |  3 +-
 core/types/RootState.ts                       |  1 +
 src/modules/index.ts                          |  4 +-
 .../mailchimp/components/Unsubscribe.ts       | 17 -----
 .../components/core/NewsletterPopup.vue       |  7 ++-
 .../core/blocks/Footer/Newsletter.vue         | 10 ++-
 .../core/blocks/MyAccount/MyNewsletter.vue    |  8 +++
 19 files changed, 167 insertions(+), 84 deletions(-)
 create mode 100644 core/modules/newsletter/components/Newsletter.ts
 rename {src/modules/mailchimp => core/modules/newsletter}/index.ts (79%)
 rename {src/modules/mailchimp/components => core/modules/newsletter/mixins}/Subscribe.ts (76%)
 create mode 100644 core/modules/newsletter/mixins/SubscriptionStatus.ts
 create mode 100644 core/modules/newsletter/mixins/Unsubscribe.ts
 rename {src/modules/mailchimp => core/modules/newsletter}/store/index.ts (57%)
 rename {src/modules/mailchimp => core/modules/newsletter}/store/mutation-types.ts (100%)
 rename src/modules/mailchimp/types/mailchimpState.ts => core/modules/newsletter/types/newsletterState.ts (59%)
 delete mode 100644 src/modules/mailchimp/components/Unsubscribe.ts

diff --git a/.gitignore b/.gitignore
index 8e800e47fc..9069dc6d6c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,6 +29,7 @@ core/resource/i18n/nl-NL.json
 core/resource/i18n/pl-PL.json
 core/resource/i18n/pt-BR.json
 core/resource/i18n/ru-RU.json
+*.iml
 
 #unit testing
 /test/unit/coverage
diff --git a/config/default.json b/config/default.json
index 3ebbf6e54c..48d70ccad4 100644
--- a/config/default.json
+++ b/config/default.json
@@ -385,7 +385,7 @@
       "fullLanguageName": "English",
       "bundleAllStoreviewLanguages": true
     },
-    "mailchimp": {
+    "newsletter": {
       "endpoint": "http://localhost:8080/api/ext/mailchimp-subscribe/subscribe"
     },
     "mailer": {
diff --git a/core/compatibility/components/blocks/MyAccount/MyNewsletter.js b/core/compatibility/components/blocks/MyAccount/MyNewsletter.js
index 98c7f2e180..dd2f415edb 100644
--- a/core/compatibility/components/blocks/MyAccount/MyNewsletter.js
+++ b/core/compatibility/components/blocks/MyAccount/MyNewsletter.js
@@ -1,35 +1,7 @@
+import { Newsletter } from '@vue-storefront/core/modules/newsletter/components/Newsletter'
+
 // this component is deprecated and is now in Newsletter module
 export default {
   name: 'MyNewsletter',
-  data () {
-    return {
-      user: {
-        isSubscribed: false
-      }
-    }
-  },
-  methods: {
-    unsubscribe () {
-      this.$store.dispatch('mailchimp/unsubscribe', this.$store.state.user.current.email).then(() => {
-        this.user.isSubscribed = false
-      }).catch(err =>
-        this.$emit('unsubscription-error', err)
-      )
-    },
-    subscribe () {
-      this.$store.dispatch('mailchimp/subscribe', this.$store.state.user.current.email).then(() => {
-        this.user.isSubscribed = true
-      }).catch(err =>
-        this.$emit('subscription-error', err)
-      )
-    },
-    updateNewsletter () {
-      if (this.user.isSubscribed) {
-        this.subscribe()
-      } else {
-        this.unsubscribe()
-      }
-      this.exitSection()
-    }
-  }
+  mixins: [Newsletter]
 }
diff --git a/core/modules/newsletter/components/Newsletter.ts b/core/modules/newsletter/components/Newsletter.ts
new file mode 100644
index 0000000000..c481644085
--- /dev/null
+++ b/core/modules/newsletter/components/Newsletter.ts
@@ -0,0 +1,8 @@
+import SubscriptionStatus from '@vue-storefront/core/modules/newsletter/mixins/SubscriptionStatus'
+import Subscribe from '@vue-storefront/core/modules/newsletter/mixins/Subscribe'
+import Unsubscribe from '@vue-storefront/core/modules/newsletter/mixins/Unsubscribe'
+
+export const Newsletter = {
+  name: 'Newsletter',
+  mixins: [SubscriptionStatus, Subscribe, Unsubscribe]
+}
diff --git a/src/modules/mailchimp/index.ts b/core/modules/newsletter/index.ts
similarity index 79%
rename from src/modules/mailchimp/index.ts
rename to core/modules/newsletter/index.ts
index d507a71961..9cd941e019 100644
--- a/src/modules/mailchimp/index.ts
+++ b/core/modules/newsletter/index.ts
@@ -2,12 +2,10 @@ import { module } from './store'
 import { VueStorefrontModule, VueStorefrontModuleConfig } from '@vue-storefront/core/lib/module'
 import { initCacheStorage } from '@vue-storefront/core/helpers/initCacheStorage'
 
-export const KEY = 'mailchimp'
+export const KEY = 'newsletter'
 export const cacheStorage = initCacheStorage(KEY)
-
 const moduleConfig: VueStorefrontModuleConfig = {
   key: KEY,
   store: { modules: [{ key: KEY, module }] },
 }
-
-export const Mailchimp = new VueStorefrontModule(moduleConfig)
\ No newline at end of file
+export const Newsletter = new VueStorefrontModule(moduleConfig)
diff --git a/src/modules/mailchimp/components/Subscribe.ts b/core/modules/newsletter/mixins/Subscribe.ts
similarity index 76%
rename from src/modules/mailchimp/components/Subscribe.ts
rename to core/modules/newsletter/mixins/Subscribe.ts
index e584b6f255..c84dfbe963 100644
--- a/src/modules/mailchimp/components/Subscribe.ts
+++ b/core/modules/newsletter/mixins/Subscribe.ts
@@ -13,8 +13,8 @@ import { required, email } from 'vuelidate/lib/validators'
  * - `submit(success?: Function, failure?: Function)` dispatches `newsletter-mailchimp/subscribe` with `email` data property. `success(res)` and `failure(err)` are callback functions called depending on subscription result and contain response info or error.
  * 
  */
-export const Subscribe = {
-  name: 'MailchimpSubscribe',
+export default {
+  name: 'NewsletterSubscribe',
   data () {
     return {
       email: ''
@@ -27,20 +27,15 @@ export const Subscribe = {
     }
   },
   methods: {
-    submit (success?: Function, failure?: Function) {
+    subscribe (success?: Function, failure?: Function) {
       // argument omitted for validation purposes
       if (!this.$v.$invalid) {
-        this.$store.dispatch('mailchimp/subscribe', this.email).then(res => {
+        this.$store.dispatch('newsletter/subscribe', this.email).then(res => {
           if (success) success(res)
         }).catch(err => {
           if (failure) failure(err)
         }
       )}
     }
-  },
-  computed: {
-    isSubscribed (): boolean {
-      return this.$store.state.mailchimp.subscribed
-    }
-  },
+  }
 }
diff --git a/core/modules/newsletter/mixins/SubscriptionStatus.ts b/core/modules/newsletter/mixins/SubscriptionStatus.ts
new file mode 100644
index 0000000000..847600e0d9
--- /dev/null
+++ b/core/modules/newsletter/mixins/SubscriptionStatus.ts
@@ -0,0 +1,63 @@
+import { required, email } from 'vuelidate/lib/validators'
+
+/**
+ * Newsletter subscription form component.
+ *
+ * #### Data
+ * - `email: String` - email that will be used for subscription, validated with vuelidate (email, required)
+ * 
+ * ### Computed
+ * - `isSubscribed: boolean` - returns true if user subscribed to the newsletter in this session
+ * 
+ * #### Methods
+ * - `submit(success?: Function, failure?: Function)` dispatches `newsletter-mailchimp/subscribe` with `email` data property. `success(res)` and `failure(err)` are callback functions called depending on subscription result and contain response info or error.
+ * 
+ */
+export default {
+  name: 'SubscriptionStatus',
+  data () {
+    return {
+      email: '',
+      user: {
+        isSubscribed: false
+      }
+    }
+  },
+  validations: {
+    email: {
+      required,
+      email
+    }
+  },
+  methods: {
+    onLoggedIn () {
+      this.email = this.$store.state.user.current.email
+      this.checkStatus(response => {
+        this.user.isSubscribed = response.result === 'subscribed'
+      })
+    },
+    checkStatus (success?: Function, failure?: Function) {
+      // argument omitted for validation purposes
+      if (!this.$v.$invalid) {
+        this.$store.dispatch('newsletter/status', this.email).then(res => {
+          if (success) success(res)
+        }).catch(err => {
+          if (failure) failure(err)
+        }
+      )}
+    }
+  },
+  beforeMount () {
+    // the user might already be logged in, so check the subscription status
+    this.onLoggedIn()
+    this.$bus.$on('user-after-loggedin', this.onLoggedIn)
+  },
+  beforeDestroy () {
+    this.$bus.$off('user-after-loggedin', this.onLoggedIn)
+  },
+  computed: {
+    isSubscribed () : Boolean {
+      return this.$store.getters['newsletter/isSubscribed']
+    }
+  }
+}
diff --git a/core/modules/newsletter/mixins/Unsubscribe.ts b/core/modules/newsletter/mixins/Unsubscribe.ts
new file mode 100644
index 0000000000..a2bf943257
--- /dev/null
+++ b/core/modules/newsletter/mixins/Unsubscribe.ts
@@ -0,0 +1,28 @@
+import { required, email } from 'vuelidate/lib/validators'
+
+export default {
+  name: 'NewsletterUnsubscribe',
+  data () {
+    return {
+      email: ''
+    }
+  },
+  validations: {
+    email: {
+      required,
+      email
+    }
+  },
+  methods: {
+    unsubscribe () {
+      // argument omitted for validation purposes
+      if (!this.$v.$invalid) {
+        this.$store.dispatch('newsletter/unsubscribe', this.email).then(res => {
+          this.$emit('unsubscribed', res)
+        }).catch(err =>
+          this.$emit('unsubscription-error', err)
+        )
+      }
+    } 
+  }
+}
diff --git a/src/modules/mailchimp/store/index.ts b/core/modules/newsletter/store/index.ts
similarity index 57%
rename from src/modules/mailchimp/store/index.ts
rename to core/modules/newsletter/store/index.ts
index 1c86b01881..1b4061993e 100644
--- a/src/modules/mailchimp/store/index.ts
+++ b/core/modules/newsletter/store/index.ts
@@ -1,15 +1,21 @@
 import * as types from './mutation-types'
 import config from 'config'
 import { Module } from 'vuex'
-import { mailchimpState } from '../types/mailchimpState'
+import { newsletterState } from '../types/newsletterState'
 import { cacheStorage } from '../'
+import CmsBlockState from "core/modules/cms/types/CmsBlockState";
+import RootState from "core/types/RootState";
 
-export const module: Module<mailchimpState, any> ={
+export const module: Module<newsletterState, any> ={
   namespaced: true,
   state: {
-    isSubscribed: null,
+    isSubscribed: false,
     email: null,
   },
+  getters: {
+    isSubscribed: state => state.isSubscribed,
+    email: state => state.email
+  },
   mutations: {
     [types.NEWSLETTER_SUBSCRIBE] (state) {
       state.isSubscribed = true
@@ -22,10 +28,30 @@ export const module: Module<mailchimpState, any> ={
     }
   },
   actions: {
+    status ({ commit, state }, email): Promise<Response> {
+      return new Promise((resolve, reject) => {
+        fetch(config.newsletter.endpoint + '?email=' + encodeURIComponent(email), {
+          method: 'GET',
+          headers: { 'Content-Type': 'application/json' },
+          mode: 'cors'
+        }).then(res => res.json())
+          .then(res => {
+          if(res.result === 'subscribed') {
+            commit(types.SET_EMAIL, email)
+            commit(types.NEWSLETTER_SUBSCRIBE)
+          } else {
+            commit(types.NEWSLETTER_UNSUBSCRIBE)
+          }
+          resolve(res)
+        }).catch(err => {
+          reject(err)
+        })
+      })
+    },
     subscribe ({ commit, state }, email): Promise<Response> {
       if (!state.isSubscribed) {
         return new Promise((resolve, reject) => {
-          fetch(config.mailchimp.endpoint, {
+          fetch(config.newsletter.endpoint, {
             method: 'POST',
             headers: { 'Content-Type': 'application/json' },
             mode: 'cors',
@@ -42,9 +68,9 @@ export const module: Module<mailchimpState, any> ={
       }
     },
     unsubscribe ({ commit, state }, email): Promise<Response> {
-      if (!state.isSubscribed) {
+      if (state.isSubscribed) {
         return new Promise((resolve, reject) => {
-          fetch(config.mailchimp.endpoint, {
+          fetch(config.newsletter.endpoint, {
             method: 'DELETE',
             headers: { 'Content-Type': 'application/json' },
             mode: 'cors',
diff --git a/src/modules/mailchimp/store/mutation-types.ts b/core/modules/newsletter/store/mutation-types.ts
similarity index 100%
rename from src/modules/mailchimp/store/mutation-types.ts
rename to core/modules/newsletter/store/mutation-types.ts
diff --git a/src/modules/mailchimp/types/mailchimpState.ts b/core/modules/newsletter/types/newsletterState.ts
similarity index 59%
rename from src/modules/mailchimp/types/mailchimpState.ts
rename to core/modules/newsletter/types/newsletterState.ts
index cb846e20f2..cfb28cdf47 100644
--- a/src/modules/mailchimp/types/mailchimpState.ts
+++ b/core/modules/newsletter/types/newsletterState.ts
@@ -1,4 +1,4 @@
-export interface mailchimpState {
+export interface newsletterState {
   isSubscribed: boolean | null,
   email: string | null
-}
\ No newline at end of file
+}
diff --git a/core/scripts/installer.js b/core/scripts/installer.js
index 186b73df94..72b55ebef8 100644
--- a/core/scripts/installer.js
+++ b/core/scripts/installer.js
@@ -450,7 +450,7 @@ class Storefront extends Abstract {
         config.cart.applycoupon_endpoint = `${backendPath}/api/cart/apply-coupon?token={{token}}&cartId={{cartId}}&coupon={{coupon}}`
         config.reviews.create_endpoint = `${backendPath}/api/review/create?token={{token}}`
 
-        config.mailchimp.endpoint = `${backendPath}/api/ext/mailchimp-subscribe/subscribe`
+        config.newsletter.endpoint = `${backendPath}/api/ext/mailchimp-subscribe/subscribe`
         config.mailer.endpoint.send = `${backendPath}/api/ext/mail-service/send-email`
         config.mailer.endpoint.token = `${backendPath}/api/ext/mail-service/get-token`
         config.images.baseUrl = this.answers.images_endpoint
diff --git a/core/store/index.ts b/core/store/index.ts
index d85aba7935..4968b1a4dd 100644
--- a/core/store/index.ts
+++ b/core/store/index.ts
@@ -19,6 +19,7 @@ const state = {
   shipping: {},
   user: {},
   ui: {},
+  newsletter: {},
   wishlist: {},
   attribute: '',
   category: {
@@ -47,4 +48,4 @@ let rootStore = new Vuex.Store<RootState>({
   state
 })
 
-export default rootStore
\ No newline at end of file
+export default rootStore
diff --git a/core/types/RootState.ts b/core/types/RootState.ts
index 515d3fc781..be459a8b0a 100644
--- a/core/types/RootState.ts
+++ b/core/types/RootState.ts
@@ -12,6 +12,7 @@ export default interface RootState {
   wishlist: any,
   attribute: string,
   ui: any,
+  newsletter: any,
   category: {
     current_path: string,
     current_product_query: any,
diff --git a/src/modules/index.ts b/src/modules/index.ts
index 2746a6d0ed..51d22fda1a 100644
--- a/src/modules/index.ts
+++ b/src/modules/index.ts
@@ -7,7 +7,7 @@ import { Compare } from '@vue-storefront/core/modules/compare'
 import { Review } from '@vue-storefront/core/modules/review'
 import { Mailer } from '@vue-storefront/core/modules/mailer'
 import { Wishlist } from '@vue-storefront/core/modules/wishlist'
-import { Mailchimp } from '../modules/mailchimp'
+import { Newsletter } from '@vue-storefront/core/modules/newsletter'
 import { Notification } from '@vue-storefront/core/modules/notification'
 import { RecentlyViewed } from '@vue-storefront/core/modules/recently-viewed'
 import { Url } from '@vue-storefront/core/modules/url'
@@ -60,7 +60,7 @@ export const registerModules: VueStorefrontModule[] = [
   Review,
   Mailer,
   Wishlist,
-  Mailchimp,
+  Newsletter,
   Notification,
   Ui,
   RecentlyViewed,
diff --git a/src/modules/mailchimp/components/Unsubscribe.ts b/src/modules/mailchimp/components/Unsubscribe.ts
deleted file mode 100644
index 3b64c05896..0000000000
--- a/src/modules/mailchimp/components/Unsubscribe.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-export const Unsubscribe = {
-  name: 'MailchimpUnsubscribe',
-  methods: {
-    unsubscribe () {
-      this.$store.dispatch('mailchimp/unsubscribe', this.email).then(res => {
-        this.$emit('unsubscribed', res)
-      }).catch(err => 
-        this.$emit('unsubscription-error', err)
-      )
-    } 
-  },
-  computed: {
-    isSubscribed () {
-      return this.$store.state.mailchimp.isSubscribed
-    }
-  }
-}
diff --git a/src/themes/default/components/core/NewsletterPopup.vue b/src/themes/default/components/core/NewsletterPopup.vue
index 5a64ae1f21..0e545480dc 100644
--- a/src/themes/default/components/core/NewsletterPopup.vue
+++ b/src/themes/default/components/core/NewsletterPopup.vue
@@ -4,7 +4,7 @@
       {{ $t('Newsletter') }}
     </p>
     <div slot="content">
-      <form @submit.prevent="submit(onSuccesfulSubmission)" novalidate>
+      <form @submit.prevent="subscribe(onSuccesfulSubmission)" novalidate>
         <div class="mb35">
           <p class="h4">
             {{ $t('Sign up to our newsletter and receive a coupon for 10% off!') }}
@@ -41,7 +41,8 @@
   </modal>
 </template>
 <script>
-import { Subscribe } from 'src/modules/mailchimp/components/Subscribe'
+import SubscriptionStatus from '@vue-storefront/core/modules/newsletter/mixins/SubscriptionStatus'
+import Subscribe from '@vue-storefront/core/modules/newsletter/mixins/Subscribe'
 import i18n from '@vue-storefront/i18n'
 
 import ButtonFull from 'theme/components/theme/ButtonFull.vue'
@@ -73,7 +74,7 @@ export default {
     BaseInput
   },
   mixins: [
-    Subscribe
+    SubscriptionStatus, Subscribe
   ]
 }
 </script>
diff --git a/src/themes/default/components/core/blocks/Footer/Newsletter.vue b/src/themes/default/components/core/blocks/Footer/Newsletter.vue
index bd26b55e4c..a0b18a66e2 100644
--- a/src/themes/default/components/core/blocks/Footer/Newsletter.vue
+++ b/src/themes/default/components/core/blocks/Footer/Newsletter.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="newsletter py25 px15 bg-cl-secondary">
+  <div class="newsletter py25 px15 bg-cl-secondary" v-if="!isSubscribed">
     <div class="container">
       <div class="newsletter-content m0 row middle-sm start-md">
         <div class="col-md-9 col-xs-12">
@@ -23,12 +23,14 @@
 </template>
 
 <script>
+import SubscriptionStatus from '@vue-storefront/core/modules/newsletter/mixins/SubscriptionStatus'
 import ButtonOutline from 'theme/components/theme/ButtonOutline'
 import { mapState } from 'vuex'
 const NewsletterPopup = () => import(/* webpackChunkName: "vsf-newsletter-modal" */ 'theme/components/core/NewsletterPopup.vue')
 
 export default {
   name: 'Newsletter',
+  mixins: [SubscriptionStatus],
   data () {
     return {
       loadNewsletterPopup: false
@@ -36,14 +38,10 @@ export default {
   },
   computed: {
     ...mapState({
-      isOpen: state => state.ui.newsletterPopup,
-      isSubscribed: state => state.mailchimp.isSubscribed
+      isOpen: state => state.ui.newsletterPopup
     })
   },
   methods: {
-    newsletterClick () {
-      this.$store.commit('ui/setNewsletterPopup', !this.isOpen)
-    },
     showNewsletterPopup () {
       this.loadNewsletterPopup = true
       this.$bus.$emit('modal-show', 'modal-newsletter')
diff --git a/src/themes/default/components/core/blocks/MyAccount/MyNewsletter.vue b/src/themes/default/components/core/blocks/MyAccount/MyNewsletter.vue
index 6cdc2d930f..0189153a4c 100644
--- a/src/themes/default/components/core/blocks/MyAccount/MyNewsletter.vue
+++ b/src/themes/default/components/core/blocks/MyAccount/MyNewsletter.vue
@@ -72,6 +72,14 @@ export default {
     },
     edit () {
       this.isEdited = true
+    },
+    updateNewsletter () {
+      if (this.user.isSubscribed) {
+        this.subscribe()
+      } else {
+        this.unsubscribe()
+      }
+      this.exitSection()
     }
   },
   mixins: [MyNewsletter]

From 6af1d79428c70da82b5a635f2d2d1205cdb5e41d Mon Sep 17 00:00:00 2001
From: Michiel De Smet <mdesmet@gmail.com>
Date: Thu, 18 Apr 2019 01:10:35 +0200
Subject: [PATCH 2/7] fixed null pointer

---
 core/modules/newsletter/mixins/SubscriptionStatus.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/modules/newsletter/mixins/SubscriptionStatus.ts b/core/modules/newsletter/mixins/SubscriptionStatus.ts
index 847600e0d9..6e5503801c 100644
--- a/core/modules/newsletter/mixins/SubscriptionStatus.ts
+++ b/core/modules/newsletter/mixins/SubscriptionStatus.ts
@@ -49,7 +49,7 @@ export default {
   },
   beforeMount () {
     // the user might already be logged in, so check the subscription status
-    this.onLoggedIn()
+    if (this.$store.state.user.current) this.onLoggedIn()
     this.$bus.$on('user-after-loggedin', this.onLoggedIn)
   },
   beforeDestroy () {

From 5d8dc507d22a8416818846bcac60a78081eb924b Mon Sep 17 00:00:00 2001
From: Michiel De Smet <mdesmet@gmail.com>
Date: Thu, 18 Apr 2019 21:38:57 +0200
Subject: [PATCH 3/7] removed unnecessary imports

---
 core/modules/newsletter/store/index.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/core/modules/newsletter/store/index.ts b/core/modules/newsletter/store/index.ts
index 1b4061993e..6f069adf14 100644
--- a/core/modules/newsletter/store/index.ts
+++ b/core/modules/newsletter/store/index.ts
@@ -3,8 +3,6 @@ import config from 'config'
 import { Module } from 'vuex'
 import { newsletterState } from '../types/newsletterState'
 import { cacheStorage } from '../'
-import CmsBlockState from "core/modules/cms/types/CmsBlockState";
-import RootState from "core/types/RootState";
 
 export const module: Module<newsletterState, any> ={
   namespaced: true,

From e53686d5963f3f10b0e8fb298b940c32d720c4e6 Mon Sep 17 00:00:00 2001
From: Michiel De Smet <mdesmet@gmail.com>
Date: Fri, 19 Apr 2019 18:35:01 +0200
Subject: [PATCH 4/7] component tests added

---
 core/modules/newsletter/mixins/Subscribe.ts   |   7 +-
 .../newsletter/mixins/SubscriptionStatus.ts   |   2 +-
 core/modules/newsletter/mixins/Unsubscribe.ts |  10 ++
 .../test/unit/components/Newsletter.spec.ts   | 158 ++++++++++++++++++
 4 files changed, 171 insertions(+), 6 deletions(-)
 create mode 100644 core/modules/newsletter/test/unit/components/Newsletter.spec.ts

diff --git a/core/modules/newsletter/mixins/Subscribe.ts b/core/modules/newsletter/mixins/Subscribe.ts
index c84dfbe963..402195e94a 100644
--- a/core/modules/newsletter/mixins/Subscribe.ts
+++ b/core/modules/newsletter/mixins/Subscribe.ts
@@ -5,12 +5,9 @@ import { required, email } from 'vuelidate/lib/validators'
  *
  * #### Data
  * - `email: String` - email that will be used for subscription, validated with vuelidate (email, required)
- * 
- * ### Computed
- * - `isSubscribed: boolean` - returns true if user subscribed to the newsletter in this session
- * 
+ *
  * #### Methods
- * - `submit(success?: Function, failure?: Function)` dispatches `newsletter-mailchimp/subscribe` with `email` data property. `success(res)` and `failure(err)` are callback functions called depending on subscription result and contain response info or error.
+ * - `subscribe(success?: Function, failure?: Function)` dispatches `newsletter/subscribe` with `email` data property. `success(res)` and `failure(err)` are callback functions called depending on subscription result and contain response info or error.
  * 
  */
 export default {
diff --git a/core/modules/newsletter/mixins/SubscriptionStatus.ts b/core/modules/newsletter/mixins/SubscriptionStatus.ts
index 6e5503801c..c212c81401 100644
--- a/core/modules/newsletter/mixins/SubscriptionStatus.ts
+++ b/core/modules/newsletter/mixins/SubscriptionStatus.ts
@@ -10,7 +10,7 @@ import { required, email } from 'vuelidate/lib/validators'
  * - `isSubscribed: boolean` - returns true if user subscribed to the newsletter in this session
  * 
  * #### Methods
- * - `submit(success?: Function, failure?: Function)` dispatches `newsletter-mailchimp/subscribe` with `email` data property. `success(res)` and `failure(err)` are callback functions called depending on subscription result and contain response info or error.
+ * - `checkStatus(success?: Function, failure?: Function)` dispatches `newsletter/status` with `email` data property. `success(res)` and `failure(err)` are callback functions called depending on subscription result and contain response info or error.
  * 
  */
 export default {
diff --git a/core/modules/newsletter/mixins/Unsubscribe.ts b/core/modules/newsletter/mixins/Unsubscribe.ts
index a2bf943257..7abfc9dcae 100644
--- a/core/modules/newsletter/mixins/Unsubscribe.ts
+++ b/core/modules/newsletter/mixins/Unsubscribe.ts
@@ -1,5 +1,15 @@
 import { required, email } from 'vuelidate/lib/validators'
 
+/**
+ * Newsletter subscription form component.
+ *
+ * #### Data
+ * - `email: String` - email that will be used for subscription, validated with vuelidate (email, required)
+ *
+ * #### Methods
+ * - `unsubscribe(success?: Function, failure?: Function)` dispatches `newsletter/unsubscribe` with `email` data property. `success(res)` and `failure(err)` are callback functions called depending on subscription result and contain response info or error.
+ *
+ */
 export default {
   name: 'NewsletterUnsubscribe',
   data () {
diff --git a/core/modules/newsletter/test/unit/components/Newsletter.spec.ts b/core/modules/newsletter/test/unit/components/Newsletter.spec.ts
new file mode 100644
index 0000000000..d70ab29bf6
--- /dev/null
+++ b/core/modules/newsletter/test/unit/components/Newsletter.spec.ts
@@ -0,0 +1,158 @@
+import { mountMixinWithStore } from "@vue-storefront/unit-tests/utils";
+
+import { Newsletter } from '../../../components/Newsletter'
+import Vue from "vue"
+import EventBus from '@vue-storefront/core/compatibility/plugins/event-bus'
+
+
+Vue.prototype.$bus = EventBus
+
+Vue.prototype.$v = {
+  $invalid: false
+};
+
+
+describe('Newsletter', () => {
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('newsletter dispatches subscriptionStatus action', () => {
+
+    const storeMock = {
+      modules: {
+        newsletter: {
+          actions: {
+            status: jest.fn()
+          },
+          namespaced: true
+        },
+        user: {
+          state: {
+            current: {
+              email: "me@example.com"
+            }
+          }
+        }
+      }
+    };
+
+    const wrapper = mountMixinWithStore(Newsletter, storeMock);
+
+    (<any> wrapper.vm).checkStatus()
+
+    expect(storeMock.modules.newsletter.actions.status).toBeCalledWith(expect.anything(), "me@example.com", undefined);
+  })
+
+  it('newsletter dispatches subscribe action', () => {
+
+    const storeMock = {
+      modules: {
+        newsletter: {
+          actions: {
+            status: jest.fn(),
+            subscribe: jest.fn()
+          },
+          namespaced: true
+        },
+        user: {
+          state: {
+            current: {
+              email: "me@example.com"
+            }
+          }
+        }
+      }
+    };
+
+    const wrapper = mountMixinWithStore(Newsletter, storeMock);
+
+    (<any> wrapper.vm).subscribe()
+
+    expect(storeMock.modules.newsletter.actions.status).toBeCalledWith(expect.anything(), "me@example.com", undefined);
+    expect(storeMock.modules.newsletter.actions.subscribe).toBeCalledWith(expect.anything(), "me@example.com", undefined);
+  })
+
+  it('newsletter dispatches unsubscribe action', () => {
+
+    const storeMock = {
+      modules: {
+        newsletter: {
+          actions: {
+            status: jest.fn(),
+            unsubscribe: jest.fn()
+          },
+          namespaced: true
+        },
+        user: {
+          state: {
+            current: {
+              email: "me@example.com"
+            }
+          }
+        }
+      }
+    };
+
+    const wrapper = mountMixinWithStore(Newsletter, storeMock);
+
+    (<any> wrapper.vm).unsubscribe()
+
+    expect(storeMock.modules.newsletter.actions.status).toBeCalledWith(expect.anything(), "me@example.com", undefined);
+    expect(storeMock.modules.newsletter.actions.unsubscribe).toBeCalledWith(expect.anything(), "me@example.com", undefined);
+  })
+
+  it('newsletter dispatches subscriptionStatus action when user is not logged in', () => {
+
+    const storeMock = {
+      modules: {
+        newsletter: {
+          actions: {
+            status: jest.fn()
+          },
+          namespaced: true
+        },
+        user: {
+          state: {
+            current: null
+          }
+        }
+      }
+    };
+
+    mountMixinWithStore(Newsletter, storeMock);
+
+    expect(storeMock.modules.newsletter.actions.status).not.toBeCalled()
+  })
+
+  it('newsletter dispatches subscriptionStatus action when user is logged in', () => {
+
+    let storeMock = {
+      modules: {
+        newsletter: {
+          actions: {
+            status: jest.fn()
+          },
+          namespaced: true
+        },
+        user: {
+          state: {
+            current: null
+          }
+        }
+      }
+    };
+
+    mountMixinWithStore(Newsletter, storeMock);
+
+    expect(storeMock.modules.newsletter.actions.status).not.toBeCalledWith()
+
+    storeMock.modules.user.state.current = {
+      email: "me@example.com"
+    }
+    EventBus.$emit('user-after-loggedin')
+    expect(storeMock.modules.newsletter.actions.status).toBeCalledWith(expect.anything(), "me@example.com", undefined)
+  })
+
+});

From c8c1aca87a36cd290b248c412e7d803110bd1a6c Mon Sep 17 00:00:00 2001
From: Luke Romanowicz <lromanowicz1@gmail.com>
Date: Tue, 23 Apr 2019 16:02:31 +0200
Subject: [PATCH 5/7] fix newsletter tests

---
 core/modules/newsletter/mixins/Subscribe.ts   |   7 +-
 .../newsletter/mixins/SubscriptionStatus.ts   |  11 +-
 core/modules/newsletter/mixins/Unsubscribe.ts |   4 +-
 .../test/unit/components/Newsletter.spec.ts   | 157 +-------
 .../test/unit/mixins/Subscribe.spec.ts        | 121 ++++++
 .../unit/mixins/SubscriptionStatus.spec.ts    | 349 ++++++++++++++++++
 .../test/unit/mixins/Unsubscribe.spec.ts      |  72 ++++
 7 files changed, 563 insertions(+), 158 deletions(-)
 create mode 100644 core/modules/newsletter/test/unit/mixins/Subscribe.spec.ts
 create mode 100644 core/modules/newsletter/test/unit/mixins/SubscriptionStatus.spec.ts
 create mode 100644 core/modules/newsletter/test/unit/mixins/Unsubscribe.spec.ts

diff --git a/core/modules/newsletter/mixins/Subscribe.ts b/core/modules/newsletter/mixins/Subscribe.ts
index 402195e94a..9b41ed24f6 100644
--- a/core/modules/newsletter/mixins/Subscribe.ts
+++ b/core/modules/newsletter/mixins/Subscribe.ts
@@ -8,7 +8,7 @@ import { required, email } from 'vuelidate/lib/validators'
  *
  * #### Methods
  * - `subscribe(success?: Function, failure?: Function)` dispatches `newsletter/subscribe` with `email` data property. `success(res)` and `failure(err)` are callback functions called depending on subscription result and contain response info or error.
- * 
+ *
  */
 export default {
   name: 'NewsletterSubscribe',
@@ -27,12 +27,13 @@ export default {
     subscribe (success?: Function, failure?: Function) {
       // argument omitted for validation purposes
       if (!this.$v.$invalid) {
-        this.$store.dispatch('newsletter/subscribe', this.email).then(res => {
+        return this.$store.dispatch('newsletter/subscribe', this.email).then(res => {
           if (success) success(res)
         }).catch(err => {
           if (failure) failure(err)
         }
-      )}
+        )
+      }
     }
   }
 }
diff --git a/core/modules/newsletter/mixins/SubscriptionStatus.ts b/core/modules/newsletter/mixins/SubscriptionStatus.ts
index c212c81401..d332f250af 100644
--- a/core/modules/newsletter/mixins/SubscriptionStatus.ts
+++ b/core/modules/newsletter/mixins/SubscriptionStatus.ts
@@ -5,13 +5,13 @@ import { required, email } from 'vuelidate/lib/validators'
  *
  * #### Data
  * - `email: String` - email that will be used for subscription, validated with vuelidate (email, required)
- * 
+ *
  * ### Computed
  * - `isSubscribed: boolean` - returns true if user subscribed to the newsletter in this session
- * 
+ *
  * #### Methods
  * - `checkStatus(success?: Function, failure?: Function)` dispatches `newsletter/status` with `email` data property. `success(res)` and `failure(err)` are callback functions called depending on subscription result and contain response info or error.
- * 
+ *
  */
 export default {
   name: 'SubscriptionStatus',
@@ -39,12 +39,13 @@ export default {
     checkStatus (success?: Function, failure?: Function) {
       // argument omitted for validation purposes
       if (!this.$v.$invalid) {
-        this.$store.dispatch('newsletter/status', this.email).then(res => {
+        return this.$store.dispatch('newsletter/status', this.email).then(res => {
           if (success) success(res)
         }).catch(err => {
           if (failure) failure(err)
         }
-      )}
+        )
+      }
     }
   },
   beforeMount () {
diff --git a/core/modules/newsletter/mixins/Unsubscribe.ts b/core/modules/newsletter/mixins/Unsubscribe.ts
index 7abfc9dcae..8816fdc706 100644
--- a/core/modules/newsletter/mixins/Unsubscribe.ts
+++ b/core/modules/newsletter/mixins/Unsubscribe.ts
@@ -27,12 +27,12 @@ export default {
     unsubscribe () {
       // argument omitted for validation purposes
       if (!this.$v.$invalid) {
-        this.$store.dispatch('newsletter/unsubscribe', this.email).then(res => {
+        return this.$store.dispatch('newsletter/unsubscribe', this.email).then(res => {
           this.$emit('unsubscribed', res)
         }).catch(err =>
           this.$emit('unsubscription-error', err)
         )
       }
-    } 
+    }
   }
 }
diff --git a/core/modules/newsletter/test/unit/components/Newsletter.spec.ts b/core/modules/newsletter/test/unit/components/Newsletter.spec.ts
index d70ab29bf6..231d2ff7d1 100644
--- a/core/modules/newsletter/test/unit/components/Newsletter.spec.ts
+++ b/core/modules/newsletter/test/unit/components/Newsletter.spec.ts
@@ -1,158 +1,19 @@
-import { mountMixinWithStore } from "@vue-storefront/unit-tests/utils";
+import { mountMixinWithStore } from '@vue-storefront/unit-tests/utils'
 
 import { Newsletter } from '../../../components/Newsletter'
-import Vue from "vue"
-import EventBus from '@vue-storefront/core/compatibility/plugins/event-bus'
-
-
-Vue.prototype.$bus = EventBus
-
-Vue.prototype.$v = {
-  $invalid: false
-};
 
+jest.mock('@vue-storefront/core/modules/newsletter/mixins/SubscriptionStatus', () => ({}))
+jest.mock('@vue-storefront/core/modules/newsletter/mixins/Subscribe', () => ({}))
+jest.mock('@vue-storefront/core/modules/newsletter/mixins/Unsubscribe', () => ({}))
 
 describe('Newsletter', () => {
-
   beforeEach(() => {
-    jest.clearAllMocks();
-  });
-
-  it('newsletter dispatches subscriptionStatus action', () => {
-
-    const storeMock = {
-      modules: {
-        newsletter: {
-          actions: {
-            status: jest.fn()
-          },
-          namespaced: true
-        },
-        user: {
-          state: {
-            current: {
-              email: "me@example.com"
-            }
-          }
-        }
-      }
-    };
-
-    const wrapper = mountMixinWithStore(Newsletter, storeMock);
-
-    (<any> wrapper.vm).checkStatus()
-
-    expect(storeMock.modules.newsletter.actions.status).toBeCalledWith(expect.anything(), "me@example.com", undefined);
-  })
-
-  it('newsletter dispatches subscribe action', () => {
-
-    const storeMock = {
-      modules: {
-        newsletter: {
-          actions: {
-            status: jest.fn(),
-            subscribe: jest.fn()
-          },
-          namespaced: true
-        },
-        user: {
-          state: {
-            current: {
-              email: "me@example.com"
-            }
-          }
-        }
-      }
-    };
-
-    const wrapper = mountMixinWithStore(Newsletter, storeMock);
-
-    (<any> wrapper.vm).subscribe()
-
-    expect(storeMock.modules.newsletter.actions.status).toBeCalledWith(expect.anything(), "me@example.com", undefined);
-    expect(storeMock.modules.newsletter.actions.subscribe).toBeCalledWith(expect.anything(), "me@example.com", undefined);
+    jest.clearAllMocks()
   })
 
-  it('newsletter dispatches unsubscribe action', () => {
+  it('can be initialized', () => {
+    const wrapper = mountMixinWithStore(Newsletter)
 
-    const storeMock = {
-      modules: {
-        newsletter: {
-          actions: {
-            status: jest.fn(),
-            unsubscribe: jest.fn()
-          },
-          namespaced: true
-        },
-        user: {
-          state: {
-            current: {
-              email: "me@example.com"
-            }
-          }
-        }
-      }
-    };
-
-    const wrapper = mountMixinWithStore(Newsletter, storeMock);
-
-    (<any> wrapper.vm).unsubscribe()
-
-    expect(storeMock.modules.newsletter.actions.status).toBeCalledWith(expect.anything(), "me@example.com", undefined);
-    expect(storeMock.modules.newsletter.actions.unsubscribe).toBeCalledWith(expect.anything(), "me@example.com", undefined);
-  })
-
-  it('newsletter dispatches subscriptionStatus action when user is not logged in', () => {
-
-    const storeMock = {
-      modules: {
-        newsletter: {
-          actions: {
-            status: jest.fn()
-          },
-          namespaced: true
-        },
-        user: {
-          state: {
-            current: null
-          }
-        }
-      }
-    };
-
-    mountMixinWithStore(Newsletter, storeMock);
-
-    expect(storeMock.modules.newsletter.actions.status).not.toBeCalled()
+    expect(wrapper.isVueInstance()).toBe(true)
   })
-
-  it('newsletter dispatches subscriptionStatus action when user is logged in', () => {
-
-    let storeMock = {
-      modules: {
-        newsletter: {
-          actions: {
-            status: jest.fn()
-          },
-          namespaced: true
-        },
-        user: {
-          state: {
-            current: null
-          }
-        }
-      }
-    };
-
-    mountMixinWithStore(Newsletter, storeMock);
-
-    expect(storeMock.modules.newsletter.actions.status).not.toBeCalledWith()
-
-    storeMock.modules.user.state.current = {
-      email: "me@example.com"
-    }
-    EventBus.$emit('user-after-loggedin')
-    expect(storeMock.modules.newsletter.actions.status).toBeCalledWith(expect.anything(), "me@example.com", undefined)
-  })
-
-});
+})
diff --git a/core/modules/newsletter/test/unit/mixins/Subscribe.spec.ts b/core/modules/newsletter/test/unit/mixins/Subscribe.spec.ts
new file mode 100644
index 0000000000..d0d726ce65
--- /dev/null
+++ b/core/modules/newsletter/test/unit/mixins/Subscribe.spec.ts
@@ -0,0 +1,121 @@
+import { mountMixinWithStore } from "@vue-storefront/unit-tests/utils";
+
+import Subscribe from '../../../mixins/Subscribe'
+
+jest.mock('vuelidate/lib/validators',() => ({
+  email: {},
+  required: {}
+}))
+
+describe('Subscribe', () => {
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('method subscribe dispatches subscription action successfully', () => {
+    const storeMock = {
+      modules: {
+        newsletter: {
+          actions: {
+            subscribe: jest.fn()
+          },
+          namespaced: true
+        },
+      }
+    };
+
+    const wrapper = mountMixinWithStore(Subscribe, storeMock, {
+      mocks: {
+        $v: {
+          $invalid: false
+        }
+      }
+    });
+
+    (<any> wrapper.vm).subscribe()
+
+    expect(storeMock.modules.newsletter.actions.subscribe).toBeCalledWith(expect.anything(), '', undefined);
+  })
+
+  it('method subscribe dispatches subscription action successfully with success Callback', async () => {
+    const storeMock = {
+      modules: {
+        newsletter: {
+          actions: {
+            subscribe: jest.fn(() => true)
+          },
+          namespaced: true
+        },
+      }
+    };
+
+    const wrapper = mountMixinWithStore(Subscribe, storeMock, {
+      mocks: {
+        $v: {
+          $invalid: false
+        }
+      }
+    });
+
+    const successCallback = jest.fn()
+
+    await (<any> wrapper.vm).subscribe(successCallback)
+
+    expect(storeMock.modules.newsletter.actions.subscribe).toBeCalledWith(expect.anything(), '', undefined);
+    expect(successCallback).toBeCalledWith(true)
+  })
+
+  it('method subscribe handles dispatching subscription action that fails', async () => {
+    const storeMock = {
+      modules: {
+        newsletter: {
+          actions: {
+            subscribe: jest.fn(()=> Promise.reject('subscription failed'))
+          },
+          namespaced: true
+        },
+      }
+    };
+
+    const wrapper = mountMixinWithStore(Subscribe, storeMock, {
+      mocks: {
+        $v: {
+          $invalid: false
+        }
+      }
+    });
+
+    await (<any> wrapper.vm).subscribe(()=>{})
+
+    expect(storeMock.modules.newsletter.actions.subscribe).toBeCalledWith(expect.anything(), '', undefined);
+  })
+
+  it('method subscribe dispatches subscription action that fails given an error handler', async () => {
+    const storeMock = {
+      modules: {
+        newsletter: {
+          actions: {
+            subscribe: jest.fn(()=> Promise.reject('subscription failed'))
+          },
+          namespaced: true
+        },
+      }
+    };
+
+    const wrapper = mountMixinWithStore(Subscribe, storeMock, {
+      mocks: {
+        $v: {
+          $invalid: false
+        }
+      }
+    });
+
+    const errorCallback = jest.fn()
+
+    await (<any> wrapper.vm).subscribe(()=>{}, errorCallback)
+
+    expect(storeMock.modules.newsletter.actions.subscribe).toBeCalledWith(expect.anything(), '', undefined);
+    expect(errorCallback).toBeCalledWith('subscription failed')
+  })
+});
diff --git a/core/modules/newsletter/test/unit/mixins/SubscriptionStatus.spec.ts b/core/modules/newsletter/test/unit/mixins/SubscriptionStatus.spec.ts
new file mode 100644
index 0000000000..52363d8a06
--- /dev/null
+++ b/core/modules/newsletter/test/unit/mixins/SubscriptionStatus.spec.ts
@@ -0,0 +1,349 @@
+import { mountMixinWithStore } from '@vue-storefront/unit-tests/utils'
+
+import SubscriptionStatus from '../../../mixins/SubscriptionStatus'
+
+jest.mock('vuelidate/lib/validators', () => ({
+  email: {},
+  required: {}
+}))
+
+describe('SubscriptionStatus', () => {
+  beforeEach(() => {
+    jest.clearAllMocks()
+  })
+
+  it('updates subscription status on mount if user emails is set', () => {
+    const storeMock = {
+      modules: {
+        newsletter: {
+          actions: {
+            status: jest.fn(() => true)
+          },
+          getters: {
+            isSubscribed: jest.fn(() => false)
+          },
+          namespaced: true
+        },
+        user: {
+          state: {
+            current: {
+              email: 'e@ma.il'
+            }
+          },
+          namespaced: true
+        }
+      }
+    }
+
+    mountMixinWithStore(SubscriptionStatus, storeMock, {
+      mocks: {
+        $emit: jest.fn(),
+        $v: {
+          $invalid: false
+        },
+        $bus: {
+          $on: jest.fn()
+        }
+      }
+    })
+
+    expect(storeMock.modules.newsletter.actions.status).toBeCalled()
+  })
+
+  it('does not update subscription status on mount if user data is not available', () => {
+    const storeMock = {
+      modules: {
+        newsletter: {
+          actions: {
+            status: jest.fn(() => true)
+          },
+          getters: {
+            isSubscribed: jest.fn(() => false)
+          },
+          namespaced: true
+        },
+        user: {
+          state: {
+            current: null
+          },
+          namespaced: true
+        }
+      }
+    }
+
+    mountMixinWithStore(SubscriptionStatus, storeMock, {
+      mocks: {
+        $emit: jest.fn(),
+        $v: {
+          $invalid: false
+        },
+        $bus: {
+          $on: jest.fn()
+        }
+      }
+    })
+
+    expect(storeMock.modules.newsletter.actions.status).not.toBeCalled()
+  })
+
+  it('starts watching subscription status on mount, stops watching on destroy', () => {
+    const storeMock = {
+      modules: {
+        newsletter: {
+          actions: {
+            status: jest.fn(() => true)
+          },
+          getters: {
+            isSubscribed: jest.fn(() => false)
+          },
+          namespaced: true
+        },
+        user: {
+          namespaced: true
+        }
+      }
+    }
+
+    const busOnHook = jest.fn()
+    const busOffHook = jest.fn()
+
+    const wrapper = mountMixinWithStore(SubscriptionStatus, storeMock, {
+      mocks: {
+        $emit: jest.fn(),
+        $v: {
+          $invalid: false
+        },
+        $bus: {
+          $on: busOnHook,
+          $off: busOffHook
+        }
+      }
+    })
+
+    wrapper.destroy()
+
+    expect(busOnHook).toBeCalled()
+    expect(busOffHook).toBeCalled()
+  })
+
+  it('updates subscription status on mount if user emails is set', () => {
+    const storeMock = {
+      modules: {
+        newsletter: {
+          actions: {
+            status: jest.fn(() => true)
+          },
+          getters: {
+            isSubscribed: jest.fn(() => false)
+          },
+          namespaced: true
+        },
+        user: {
+          state: {
+            current: {
+              email: 'e@ma.il'
+            }
+          },
+          namespaced: true
+        }
+      }
+    }
+
+    const busOnHook = jest.fn()
+    const busOffHook = jest.fn()
+
+    const wrapper = mountMixinWithStore(SubscriptionStatus, storeMock, {
+      mocks: {
+        $emit: jest.fn(),
+        $v: {
+          $invalid: false
+        },
+        $bus: {
+          $on: busOnHook,
+          $off: busOffHook
+        }
+      }
+    })
+
+    wrapper.destroy()
+
+    expect(storeMock.modules.newsletter.actions.status).toBeCalled()
+    expect(busOnHook).toBeCalled()
+    expect(busOffHook).toBeCalled()
+  })
+
+  it('renders subscription status', () => {
+    const storeMock = {
+      modules: {
+        newsletter: {
+          actions: {
+            status: jest.fn(() => true)
+          },
+          getters: {
+            isSubscribed: jest.fn(() => true)
+          },
+          namespaced: true
+        },
+        user: {
+          namespaced: true
+        }
+      }
+    }
+
+    const wrapper = mountMixinWithStore(SubscriptionStatus, storeMock, {
+      mocks: {
+        $emit: jest.fn(),
+        $v: {
+          $invalid: false
+        },
+        $bus: {
+          $on: jest.fn()
+        }
+      }
+    }, "<p v-if='isSubscribed'>should be displayed</p>")
+
+    expect(wrapper).toMatchInlineSnapshot('<p>should be displayed</p>')
+  })
+
+  it('method checkStatus can be called without callbacks', () => {
+    const storeMock = {
+      modules: {
+        newsletter: {
+          actions: {
+            status: jest.fn(() => true)
+          },
+          getters: {
+            isSubscribed: jest.fn(() => true)
+          },
+          namespaced: true
+        },
+        user: {
+          namespaced: true
+        }
+      }
+    }
+
+    const wrapper = mountMixinWithStore(SubscriptionStatus, storeMock, {
+      mocks: {
+        $emit: jest.fn(),
+        $v: {
+          $invalid: false
+        },
+        $bus: {
+          $on: jest.fn()
+        }
+      }
+    });
+
+    (<any> wrapper.vm).checkStatus()
+
+    expect(storeMock.modules.newsletter.actions.status).toBeCalled()
+  })
+
+  it('method checkStatus can be called without callbacks', () => {
+    const storeMock = {
+      modules: {
+        newsletter: {
+          actions: {
+            status: jest.fn(() => true)
+          },
+          getters: {
+            isSubscribed: jest.fn(() => true)
+          },
+          namespaced: true
+        },
+        user: {
+          namespaced: true
+        }
+      }
+    }
+
+    const wrapper = mountMixinWithStore(SubscriptionStatus, storeMock, {
+      mocks: {
+        $emit: jest.fn(),
+        $v: {
+          $invalid: false
+        },
+        $bus: {
+          $on: jest.fn()
+        }
+      }
+    });
+
+    (<any> wrapper.vm).checkStatus()
+
+    expect(storeMock.modules.newsletter.actions.status).toBeCalled()
+  })
+
+  it('method checkStatus handles dispatching fetching status data action that fails', async () => {
+    const storeMock = {
+      modules: {
+        newsletter: {
+          actions: {
+            status: jest.fn(() => Promise.reject('fetching failed'))
+          },
+          getters: {
+            isSubscribed: jest.fn(() => true)
+          },
+          namespaced: true
+        },
+        user: {
+          namespaced: true
+        }
+      }
+    }
+
+    const wrapper = mountMixinWithStore(SubscriptionStatus, storeMock, {
+      mocks: {
+        $emit: jest.fn(),
+        $v: {
+          $invalid: false
+        },
+        $bus: {
+          $on: jest.fn()
+        }
+      }
+    });
+
+    await (<any> wrapper.vm).checkStatus()
+
+    expect(storeMock.modules.newsletter.actions.status).toBeCalled()
+  })
+
+  it('method checkStatus handles dispatching fetching status data action that fails with custom handler', async () => {
+    const storeMock = {
+      modules: {
+        newsletter: {
+          actions: {
+            status: jest.fn(() => Promise.reject('fetching failed'))
+          },
+          getters: {
+            isSubscribed: jest.fn(() => true)
+          },
+          namespaced: true
+        },
+        user: {
+          namespaced: true
+        }
+      }
+    }
+
+    const wrapper = mountMixinWithStore(SubscriptionStatus, storeMock, {
+      mocks: {
+        $emit: jest.fn(),
+        $v: {
+          $invalid: false
+        },
+        $bus: {
+          $on: jest.fn()
+        }
+      }
+    });
+
+    const errorHandler = jest.fn()
+
+    await (<any> wrapper.vm).checkStatus(()=>{}, errorHandler)
+
+    expect(errorHandler).toBeCalled()
+  })
+})
diff --git a/core/modules/newsletter/test/unit/mixins/Unsubscribe.spec.ts b/core/modules/newsletter/test/unit/mixins/Unsubscribe.spec.ts
new file mode 100644
index 0000000000..d3abe7d980
--- /dev/null
+++ b/core/modules/newsletter/test/unit/mixins/Unsubscribe.spec.ts
@@ -0,0 +1,72 @@
+import { mountMixinWithStore } from "@vue-storefront/unit-tests/utils";
+
+import Unsubscribe from '../../../mixins/Unsubscribe'
+
+jest.mock('vuelidate/lib/validators',() => ({
+  email: {},
+  required: {}
+}))
+
+describe('Unsubscribe', () => {
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('method unsubscribe dispatches unsubscribe action successfully', async () => {
+    const storeMock = {
+      modules: {
+        newsletter: {
+          actions: {
+            unsubscribe: jest.fn(() => true)
+          },
+          namespaced: true
+        },
+      }
+    };
+    const emit = jest.fn()
+
+    const wrapper = mountMixinWithStore(Unsubscribe, storeMock, {
+      mocks: {
+        $emit: emit,
+        $v: {
+          $invalid: false
+        }
+      }
+    });
+
+    await (<any> wrapper.vm).unsubscribe()
+
+    expect(storeMock.modules.newsletter.actions.unsubscribe).toBeCalledWith(expect.anything(), '', undefined);
+    expect(emit).toBeCalledWith('unsubscribed', true)
+  })
+
+
+  it('method unsubscribe dispatches unsubscribe action but it fails', async () => {
+    const storeMock = {
+      modules: {
+        newsletter: {
+          actions: {
+            unsubscribe: jest.fn(() => Promise.reject('error'))
+          },
+          namespaced: true
+        },
+      }
+    };
+    const emit = jest.fn()
+
+    const wrapper = mountMixinWithStore(Unsubscribe, storeMock, {
+      mocks: {
+        $emit: emit,
+        $v: {
+          $invalid: false
+        }
+      }
+    });
+
+    await (<any> wrapper.vm).unsubscribe()
+
+    expect(storeMock.modules.newsletter.actions.unsubscribe).toBeCalledWith(expect.anything(), '', undefined);
+    expect(emit).toBeCalledWith('unsubscription-error', 'error')
+  })
+});

From fc6c56789eee3a0d57ca5d925949f626b017b7f2 Mon Sep 17 00:00:00 2001
From: Luke Romanowicz <lromanowicz1@gmail.com>
Date: Tue, 23 Apr 2019 16:34:32 +0200
Subject: [PATCH 6/7] Newsletter changelog update

---
 CHANGELOG.md                       | 1 +
 docs/guide/upgrade-notes/README.md | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 969f6d6878..68d6ca350b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Global config api path under `api.url` - @BartoszLiburski (#2622)
 - Google Tag Manager integration - @talalus (#841)
 - Portuguese (pt-PT) translation - @xlcnd (#2695)
+- Module Mailchimp is removed in favor of more generic Newsletter - @mdesmet (#2558)
 
 ### Fixed
 - Sidebar menu wasn't possible to scroll - @PanMisza (#2627)
diff --git a/docs/guide/upgrade-notes/README.md b/docs/guide/upgrade-notes/README.md
index 9fccd1427c..6903d8fd6c 100644
--- a/docs/guide/upgrade-notes/README.md
+++ b/docs/guide/upgrade-notes/README.md
@@ -2,6 +2,9 @@
 
 We're trying to keep the upgrade process as easy as it's possible. Unfortunately, sometimes manual code changes are required. Before pulling out the latest version, please take a look at the upgrade notes below:
 
+## 1.9 -> 1.10
+- Module Mailchimp is removed in favor of Newsletter. `local.json` configuration under key `mailchimp` moved to key `newsletter`.
+
 ## 1.8 -> 1.9
 - `cart.multisiteCommonCart` config property changed to `storeViews.commonCache`
 - Way of creating VS Modules was changed to use factory method instead of explict object creation. Even though the feature is backward compatible we highly encourage all developers to refactor their modules to use new syntax.

From 9263683f009bd839b1690d8c9d800a05896aeecb Mon Sep 17 00:00:00 2001
From: Michiel De Smet <mdesmet@gmail.com>
Date: Sat, 11 May 2019 23:33:01 +0200
Subject: [PATCH 7/7] removed MyNewsletter.js

---
 .../components/blocks/MyAccount/MyNewsletter.js            | 7 -------
 .../components/core/blocks/MyAccount/MyNewsletter.vue      | 4 ++--
 2 files changed, 2 insertions(+), 9 deletions(-)
 delete mode 100644 core/compatibility/components/blocks/MyAccount/MyNewsletter.js

diff --git a/core/compatibility/components/blocks/MyAccount/MyNewsletter.js b/core/compatibility/components/blocks/MyAccount/MyNewsletter.js
deleted file mode 100644
index dd2f415edb..0000000000
--- a/core/compatibility/components/blocks/MyAccount/MyNewsletter.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import { Newsletter } from '@vue-storefront/core/modules/newsletter/components/Newsletter'
-
-// this component is deprecated and is now in Newsletter module
-export default {
-  name: 'MyNewsletter',
-  mixins: [Newsletter]
-}
diff --git a/src/themes/default/components/core/blocks/MyAccount/MyNewsletter.vue b/src/themes/default/components/core/blocks/MyAccount/MyNewsletter.vue
index 22ce408607..79fc7685ea 100644
--- a/src/themes/default/components/core/blocks/MyAccount/MyNewsletter.vue
+++ b/src/themes/default/components/core/blocks/MyAccount/MyNewsletter.vue
@@ -36,7 +36,7 @@
 </template>
 
 <script>
-import MyNewsletter from '@vue-storefront/core/compatibility/components/blocks/MyAccount/MyNewsletter'
+import { Newsletter } from '@vue-storefront/core/modules/newsletter/components/Newsletter'
 import ButtonFull from 'theme/components/theme/ButtonFull.vue'
 import BaseCheckbox from '../Form/BaseCheckbox.vue'
 
@@ -62,6 +62,6 @@ export default {
       this.exitSection()
     }
   },
-  mixins: [MyNewsletter]
+  mixins: [Newsletter]
 }
 </script>