From 7e3412ce8ed3f21f5fc167744c7dc3ce89b65914 Mon Sep 17 00:00:00 2001
From: Naz Gargol <nazargargol@gmail.com>
Date: Thu, 26 Sep 2019 15:58:01 +0200
Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A5=20Removed=20all=20subscriber=20fea?=
 =?UTF-8?q?ture=20related=20code=20(#1337)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

refs https://github.com/TryGhost/Ghost/pull/11153

- Removed all subscriber feature related code
- The feature is being substituted by members
---
 ghost/admin/app/components/gh-feature-flag.js |   3 -
 .../app/components/modal-delete-subscriber.js |  20 --
 .../components/modal-import-subscribers.js    |  43 ----
 .../app/components/modal-new-subscriber.js    |  47 ----
 ghost/admin/app/controllers/subscribers.js    | 116 ----------
 .../app/controllers/subscribers/import.js     |  19 --
 ghost/admin/app/helpers/event-name.js         |   6 +-
 .../app/helpers/subscribers-query-params.js   |  21 --
 .../app/helpers/subscribers-sort-icon.js      |  14 --
 ghost/admin/app/mixins/validation-engine.js   |   2 -
 ghost/admin/app/models/subscriber.js          |  22 --
 ghost/admin/app/router.js                     |   5 -
 ghost/admin/app/routes/subscribers.js         |  35 ---
 ghost/admin/app/routes/subscribers/import.js  |   4 -
 ghost/admin/app/routes/subscribers/new.js     |  38 ----
 ghost/admin/app/serializers/subscriber.js     |  20 --
 ghost/admin/app/services/feature.js           |   1 -
 ghost/admin/app/styles/app-dark.css           |   5 -
 ghost/admin/app/styles/app.css                |   1 -
 .../admin/app/styles/layouts/subscribers.css  | 105 ---------
 .../app/templates/components/gh-nav-menu.hbs  |   3 -
 .../components/modal-delete-subscriber.hbs    |  19 --
 .../components/modal-import-subscribers.hbs   |  47 ----
 .../components/modal-new-subscriber.hbs       |  44 ----
 ghost/admin/app/templates/settings/labs.hbs   |  14 --
 ghost/admin/app/templates/subscribers.hbs     | 100 ---------
 .../app/templates/subscribers/import.hbs      |   4 -
 ghost/admin/app/templates/subscribers/new.hbs |   5 -
 ghost/admin/mirage/config.js                  |   2 -
 ghost/admin/mirage/config/subscribers.js      |  50 -----
 ghost/admin/mirage/factories/subscriber.js    |  20 --
 ghost/admin/mirage/fixtures/configs.js        |   2 +-
 ghost/admin/mirage/fixtures/settings.js       |   2 +-
 ghost/admin/mirage/scenarios/default.js       |   1 -
 .../tests/acceptance/error-handling-test.js   |  13 --
 .../tests/acceptance/subscribers-test.js      | 208 ------------------
 .../tests/unit/validators/subscriber-test.js  |  73 ------
 37 files changed, 3 insertions(+), 1131 deletions(-)
 delete mode 100644 ghost/admin/app/components/modal-delete-subscriber.js
 delete mode 100644 ghost/admin/app/components/modal-import-subscribers.js
 delete mode 100644 ghost/admin/app/components/modal-new-subscriber.js
 delete mode 100644 ghost/admin/app/controllers/subscribers.js
 delete mode 100644 ghost/admin/app/controllers/subscribers/import.js
 delete mode 100644 ghost/admin/app/helpers/subscribers-query-params.js
 delete mode 100644 ghost/admin/app/helpers/subscribers-sort-icon.js
 delete mode 100644 ghost/admin/app/models/subscriber.js
 delete mode 100644 ghost/admin/app/routes/subscribers.js
 delete mode 100644 ghost/admin/app/routes/subscribers/import.js
 delete mode 100644 ghost/admin/app/routes/subscribers/new.js
 delete mode 100644 ghost/admin/app/serializers/subscriber.js
 delete mode 100644 ghost/admin/app/styles/layouts/subscribers.css
 delete mode 100644 ghost/admin/app/templates/components/modal-delete-subscriber.hbs
 delete mode 100644 ghost/admin/app/templates/components/modal-import-subscribers.hbs
 delete mode 100644 ghost/admin/app/templates/components/modal-new-subscriber.hbs
 delete mode 100644 ghost/admin/app/templates/subscribers.hbs
 delete mode 100644 ghost/admin/app/templates/subscribers/import.hbs
 delete mode 100644 ghost/admin/app/templates/subscribers/new.hbs
 delete mode 100644 ghost/admin/mirage/config/subscribers.js
 delete mode 100644 ghost/admin/mirage/factories/subscriber.js
 delete mode 100644 ghost/admin/tests/acceptance/subscribers-test.js
 delete mode 100644 ghost/admin/tests/unit/validators/subscriber-test.js

diff --git a/ghost/admin/app/components/gh-feature-flag.js b/ghost/admin/app/components/gh-feature-flag.js
index 820bd4a872..7aac678593 100644
--- a/ghost/admin/app/components/gh-feature-flag.js
+++ b/ghost/admin/app/components/gh-feature-flag.js
@@ -20,9 +20,6 @@ const FeatureFlagComponent = Component.extend({
             return this._flagValue;
         },
         set(key, value) {
-            if (this.flag === 'members' && value === true) {
-                this.set(`feature.subscribers`, false);
-            }
             return this.set(`feature.${this.flag}`, value);
         }
     }),
diff --git a/ghost/admin/app/components/modal-delete-subscriber.js b/ghost/admin/app/components/modal-delete-subscriber.js
deleted file mode 100644
index 25e623d703..0000000000
--- a/ghost/admin/app/components/modal-delete-subscriber.js
+++ /dev/null
@@ -1,20 +0,0 @@
-import ModalComponent from 'ghost-admin/components/modal-base';
-import {alias} from '@ember/object/computed';
-import {task} from 'ember-concurrency';
-
-export default ModalComponent.extend({
-    // Allowed actions
-    confirm: () => {},
-
-    subscriber: alias('model'),
-
-    actions: {
-        confirm() {
-            this.deleteSubscriber.perform();
-        }
-    },
-
-    deleteSubscriber: task(function* () {
-        yield this.confirm();
-    }).drop()
-});
diff --git a/ghost/admin/app/components/modal-import-subscribers.js b/ghost/admin/app/components/modal-import-subscribers.js
deleted file mode 100644
index b0e905bc5c..0000000000
--- a/ghost/admin/app/components/modal-import-subscribers.js
+++ /dev/null
@@ -1,43 +0,0 @@
-import ModalComponent from 'ghost-admin/components/modal-base';
-import ghostPaths from 'ghost-admin/utils/ghost-paths';
-import {computed} from '@ember/object';
-
-export default ModalComponent.extend({
-    labelText: 'Select or drag-and-drop a CSV File',
-
-    response: null,
-    closeDisabled: false,
-
-    // Allowed actions
-    confirm: () => {},
-
-    uploadUrl: computed(function () {
-        return `${ghostPaths().apiRoot}/subscribers/csv/`;
-    }),
-
-    actions: {
-        uploadStarted() {
-            this.set('closeDisabled', true);
-        },
-
-        uploadFinished() {
-            this.set('closeDisabled', false);
-        },
-
-        uploadSuccess(response) {
-            this.set('response', response.meta.stats);
-            // invoke the passed in confirm action
-            this.confirm();
-        },
-
-        confirm() {
-            // noop - we don't want the enter key doing anything
-        },
-
-        closeModal() {
-            if (!this.closeDisabled) {
-                this._super(...arguments);
-            }
-        }
-    }
-});
diff --git a/ghost/admin/app/components/modal-new-subscriber.js b/ghost/admin/app/components/modal-new-subscriber.js
deleted file mode 100644
index 03b8fdd02f..0000000000
--- a/ghost/admin/app/components/modal-new-subscriber.js
+++ /dev/null
@@ -1,47 +0,0 @@
-import ModalComponent from 'ghost-admin/components/modal-base';
-import {alias} from '@ember/object/computed';
-import {A as emberA} from '@ember/array';
-import {isInvalidError} from 'ember-ajax/errors';
-import {task} from 'ember-concurrency';
-
-export default ModalComponent.extend({
-
-    subscriber: alias('model'),
-
-    actions: {
-        updateEmail(newEmail) {
-            this.set('subscriber.email', newEmail);
-            this.set('subscriber.hasValidated', emberA());
-            this.get('subscriber.errors').clear();
-        },
-
-        confirm() {
-            this.addSubscriber.perform();
-        }
-    },
-
-    addSubscriber: task(function* () {
-        try {
-            yield this.confirm();
-            this.send('closeModal');
-        } catch (error) {
-            // TODO: server-side validation errors should be serialized
-            // properly so that errors are added to model.errors automatically
-            if (error && isInvalidError(error)) {
-                let [firstError] = error.payload.errors;
-                let {context} = firstError;
-
-                if (context && context.match(/email/i)) {
-                    this.get('subscriber.errors').add('email', context);
-                    this.get('subscriber.hasValidated').pushObject('email');
-                    return;
-                }
-            }
-
-            // route action so it should bubble up to the global error handler
-            if (error) {
-                throw error;
-            }
-        }
-    }).drop()
-});
diff --git a/ghost/admin/app/controllers/subscribers.js b/ghost/admin/app/controllers/subscribers.js
deleted file mode 100644
index 2b75397978..0000000000
--- a/ghost/admin/app/controllers/subscribers.js
+++ /dev/null
@@ -1,116 +0,0 @@
-import $ from 'jquery';
-import Controller from '@ember/controller';
-import ghostPaths from 'ghost-admin/utils/ghost-paths';
-import moment from 'moment';
-import {computed} from '@ember/object';
-import {inject as service} from '@ember/service';
-import {task} from 'ember-concurrency';
-
-const orderMap = {
-    email: 'email',
-    created_at: 'createdAtUTC',
-    status: 'status'
-};
-
-/* eslint-disable ghost/ember/alias-model-in-controller */
-export default Controller.extend({
-    session: service(),
-
-    queryParams: ['order', 'direction'],
-    order: 'created_at',
-    direction: 'desc',
-
-    subscribers: null,
-    subscriberToDelete: null,
-
-    init() {
-        this._super(...arguments);
-        this.set('subscribers', this.store.peekAll('subscriber'));
-    },
-
-    filteredSubscribers: computed('subscribers.@each.{email,createdAtUTC}', function () {
-        return this.subscribers.toArray().filter((subscriber) => {
-            return !subscriber.isNew && !subscriber.isDeleted;
-        });
-    }),
-
-    sortedSubscribers: computed('order', 'direction', 'subscribers.@each.{email,createdAtUTC,status}', function () {
-        let {filteredSubscribers, order, direction} = this;
-
-        let sorted = filteredSubscribers.sort((a, b) => {
-            let values = [a.get(orderMap[order]), b.get(orderMap[order])];
-
-            if (direction === 'desc') {
-                values = values.reverse();
-            }
-
-            if (typeof values[0] === 'string') {
-                return values[0].localeCompare(values[1], undefined, {ignorePunctuation: true});
-            }
-
-            if (typeof values[0] === 'object' && values[0]._isAMomentObject) {
-                return values[0].valueOf() - values[1].valueOf();
-            }
-
-            return values[0] - values[1];
-        });
-
-        return sorted;
-    }),
-
-    actions: {
-        deleteSubscriber(subscriber) {
-            this.set('subscriberToDelete', subscriber);
-        },
-
-        confirmDeleteSubscriber() {
-            let subscriber = this.subscriberToDelete;
-
-            return subscriber.destroyRecord().then(() => {
-                this.set('subscriberToDelete', null);
-            });
-        },
-
-        cancelDeleteSubscriber() {
-            this.set('subscriberToDelete', null);
-        },
-
-        exportData() {
-            let exportUrl = ghostPaths().url.api('subscribers/csv');
-            let accessToken = this.get('session.data.authenticated.access_token');
-            let downloadURL = `${exportUrl}?access_token=${accessToken}`;
-            let iframe = $('#iframeDownload');
-
-            if (iframe.length === 0) {
-                iframe = $('<iframe>', {id: 'iframeDownload'}).hide().appendTo('body');
-            }
-
-            iframe.attr('src', downloadURL);
-        }
-    },
-
-    fetchSubscribers: task(function* () {
-        let newFetchDate = new Date();
-        let results;
-
-        if (this._hasFetchedAll) {
-            // fetch any records modified since last fetch
-            results = yield this.store.query('subscriber', {
-                limit: 'all',
-                filter: `updated_at:>='${moment.utc(this._lastFetchDate).format('YYYY-MM-DD HH:mm:ss')}'`
-            });
-        } else {
-            // fetch all records in batches of 200
-            while (!results || results.meta.pagination.page < results.meta.pagination.pages) {
-                results = yield this.store.query('subscriber', {
-                    limit: 200,
-                    order: `${this.order} ${this.direction}`,
-                    page: results ? results.meta.pagination.page + 1 : 1
-                });
-            }
-            this._hasFetchedAll = true;
-        }
-
-        this._lastFetchDate = newFetchDate;
-    })
-});
diff --git a/ghost/admin/app/controllers/subscribers/import.js b/ghost/admin/app/controllers/subscribers/import.js
deleted file mode 100644
index 459f349c16..0000000000
--- a/ghost/admin/app/controllers/subscribers/import.js
+++ /dev/null
@@ -1,19 +0,0 @@
-import Controller from '@ember/controller';
-import {inject as controller} from '@ember/controller';
-import {inject as service} from '@ember/service';
-
-/* eslint-disable ghost/ember/alias-model-in-controller */
-export default Controller.extend({
-    subscribers: controller(),
-    router: service(),
-
-    actions: {
-        fetchNewSubscribers() {
-            this.subscribers.fetchSubscribers.perform();
-        },
-
-        close() {
-            this.router.transitionTo('subscribers');
-        }
-    }
-});
diff --git a/ghost/admin/app/helpers/event-name.js b/ghost/admin/app/helpers/event-name.js
index 75eca5372b..c320188489 100644
--- a/ghost/admin/app/helpers/event-name.js
+++ b/ghost/admin/app/helpers/event-name.js
@@ -27,11 +27,7 @@ export const AVAILABLE_EVENTS = [
     // GROUPNAME: Tags
     {event: 'tag.added', name: 'Tag created', group: 'Tags'},
     {event: 'tag.edited', name: 'Tag updated', group: 'Tags'},
-    {event: 'tag.deleted', name: 'Tag deleted', group: 'Tags'},
-
-    // GROUPNAME: Subscribers
-    {event: 'subscriber.added', name: 'Subscriber added', group: 'Subscribers'},
-    {event: 'subscriber.deleted', name: 'Subscriber deleted', group: 'Subscribers'}
+    {event: 'tag.deleted', name: 'Tag deleted', group: 'Tags'}
 ];
 
 export function eventName([event]/*, hash*/) {
diff --git a/ghost/admin/app/helpers/subscribers-query-params.js b/ghost/admin/app/helpers/subscribers-query-params.js
deleted file mode 100644
index 4e454015c6..0000000000
--- a/ghost/admin/app/helpers/subscribers-query-params.js
+++ /dev/null
@@ -1,21 +0,0 @@
-import {helper} from '@ember/component/helper';
-
-export function subscribersQueryParams([order, currentOrder, direction]) {
-    // if order hasn't changed we toggle the direction
-    if (order === currentOrder) {
-        direction = direction === 'asc' ? 'desc' : 'asc';
-    }
-
-    return [
-        'subscribers',
-        {
-            isQueryParams: true,
-            values: {
-                order,
-                direction
-            }
-        }
-    ];
-}
-
-export default helper(subscribersQueryParams);
diff --git a/ghost/admin/app/helpers/subscribers-sort-icon.js b/ghost/admin/app/helpers/subscribers-sort-icon.js
deleted file mode 100644
index 9257526111..0000000000
--- a/ghost/admin/app/helpers/subscribers-sort-icon.js
+++ /dev/null
@@ -1,14 +0,0 @@
-import {helper} from '@ember/component/helper';
-import {svgJar} from './svg-jar';
-
-export function subscribersSortIcon([order, currentOrder, direction]) {
-    if (order === currentOrder) {
-        if (direction === 'asc') {
-            return svgJar('arrow-up', {class: 'ih2 mr2'});
-        } else {
-            return svgJar('arrow-down', {class: 'ih2 mr2'});
-        }
-    }
-}
-
-export default helper(subscribersSortIcon);
diff --git a/ghost/admin/app/mixins/validation-engine.js b/ghost/admin/app/mixins/validation-engine.js
index 53c4167b8f..449f2e5f7f 100644
--- a/ghost/admin/app/mixins/validation-engine.js
+++ b/ghost/admin/app/mixins/validation-engine.js
@@ -12,7 +12,6 @@ import SetupValidator from 'ghost-admin/validators/setup';
 import SigninValidator from 'ghost-admin/validators/signin';
 import SignupValidator from 'ghost-admin/validators/signup';
 import SlackIntegrationValidator from 'ghost-admin/validators/slack-integration';
-import SubscriberValidator from 'ghost-admin/validators/subscriber';
 import TagSettingsValidator from 'ghost-admin/validators/tag-settings';
 import UserValidator from 'ghost-admin/validators/user';
 import WebhookValidator from 'ghost-admin/validators/webhook';
@@ -42,7 +41,6 @@ export default Mixin.create({
         signin: SigninValidator,
         signup: SignupValidator,
         slackIntegration: SlackIntegrationValidator,
-        subscriber: SubscriberValidator,
         tag: TagSettingsValidator,
         user: UserValidator,
         integration: IntegrationValidator,
diff --git a/ghost/admin/app/models/subscriber.js b/ghost/admin/app/models/subscriber.js
deleted file mode 100644
index a6808c095e..0000000000
--- a/ghost/admin/app/models/subscriber.js
+++ /dev/null
@@ -1,22 +0,0 @@
-import Model from 'ember-data/model';
-import ValidationEngine from 'ghost-admin/mixins/validation-engine';
-import attr from 'ember-data/attr';
-import {belongsTo} from 'ember-data/relationships';
-
-export default Model.extend(ValidationEngine, {
-    validationType: 'subscriber',
-
-    name: attr('string'),
-    email: attr('string'),
-    status: attr('string'),
-    subscribedUrl: attr('string'),
-    subscribedReferrer: attr('string'),
-    unsubscribedUrl: attr('string'),
-    unsubscribedAtUTC: attr('moment-utc'),
-    createdAtUTC: attr('moment-utc'),
-    updatedAtUTC: attr('moment-utc'),
-    createdBy: attr('number'),
-    updatedBy: attr('number'),
-
-    post: belongsTo('post')
-});
diff --git a/ghost/admin/app/router.js b/ghost/admin/app/router.js
index 5638d8d978..3899960f25 100644
--- a/ghost/admin/app/router.js
+++ b/ghost/admin/app/router.js
@@ -61,11 +61,6 @@ Router.map(function () {
     this.route('members');
     this.route('member', {path: '/members/:member_id'});
 
-    this.route('subscribers', function () {
-        this.route('new');
-        this.route('import');
-    });
-
     this.route('error404', {path: '/*path'});
 });
 
diff --git a/ghost/admin/app/routes/subscribers.js b/ghost/admin/app/routes/subscribers.js
deleted file mode 100644
index 8683c51954..0000000000
--- a/ghost/admin/app/routes/subscribers.js
+++ /dev/null
@@ -1,35 +0,0 @@
-import AuthenticatedRoute from 'ghost-admin/routes/authenticated';
-import RSVP from 'rsvp';
-import {inject as service} from '@ember/service';
-
-export default AuthenticatedRoute.extend({
-    feature: service(),
-
-    // redirect if subscribers is disabled or user isn't owner/admin
-    beforeModel() {
-        this._super(...arguments);
-        let promises = {
-            user: this.get('session.user'),
-            subscribers: this.get('feature.subscribers')
-        };
-
-        return RSVP.hash(promises).then((hash) => {
-            let {user, subscribers} = hash;
-
-            if (!subscribers || !user.isOwnerOrAdmin) {
-                return this.transitionTo('home');
-            }
-        });
-    },
-
-    setupController(controller) {
-        this._super(...arguments);
-        controller.fetchSubscribers.perform();
-    },
-
-    buildRouteInfoMetadata() {
-        return {
-            titleToken: 'Subscribers'
-        };
-    }
-});
diff --git a/ghost/admin/app/routes/subscribers/import.js b/ghost/admin/app/routes/subscribers/import.js
deleted file mode 100644
index 6c74252aa1..0000000000
--- a/ghost/admin/app/routes/subscribers/import.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import Route from '@ember/routing/route';
-
-export default Route.extend({
-});
diff --git a/ghost/admin/app/routes/subscribers/new.js b/ghost/admin/app/routes/subscribers/new.js
deleted file mode 100644
index 4b1f1dd124..0000000000
--- a/ghost/admin/app/routes/subscribers/new.js
+++ /dev/null
@@ -1,38 +0,0 @@
-import Route from '@ember/routing/route';
-
-export default Route.extend({
-    model() {
-        return this.store.createRecord('subscriber');
-    },
-
-    setupController(controller, model) {
-        controller.set('subscriber', model);
-    },
-
-    deactivate() {
-        let subscriber = this.controller.get('subscriber');
-
-        this._super(...arguments);
-
-        if (subscriber.get('isNew')) {
-            this.rollbackModel();
-        }
-    },
-
-    actions: {
-        save() {
-            let subscriber = this.controller.get('subscriber');
-            return subscriber.save();
-        },
-
-        cancel() {
-            this.rollbackModel();
-            this.transitionTo('subscribers');
-        }
-    },
-
-    rollbackModel() {
-        let subscriber = this.controller.get('subscriber');
-        subscriber.rollbackAttributes();
-    }
-});
diff --git a/ghost/admin/app/serializers/subscriber.js b/ghost/admin/app/serializers/subscriber.js
deleted file mode 100644
index a5e8cc868c..0000000000
--- a/ghost/admin/app/serializers/subscriber.js
+++ /dev/null
@@ -1,20 +0,0 @@
-import ApplicationSerializer from 'ghost-admin/serializers/application';
-
-export default ApplicationSerializer.extend({
-    attrs: {
-        unsubscribedAtUTC: {key: 'unsubscribed_at'},
-        createdAtUTC: {key: 'created_at'},
-        updatedAtUTC: {key: 'updated_at'}
-    },
-
-    serialize() {
-        let json = this._super(...arguments);
-
-        // the API can't handle `status` being `null`
-        if (!json.status) {
-            delete json.status;
-        }
-
-        return json;
-    }
-});
diff --git a/ghost/admin/app/services/feature.js b/ghost/admin/app/services/feature.js
index 5f1df3bff1..26f882a5bf 100644
--- a/ghost/admin/app/services/feature.js
+++ b/ghost/admin/app/services/feature.js
@@ -50,7 +50,6 @@ export default Service.extend({
     notifications: service(),
     lazyLoader: service(),
 
-    subscribers: feature('subscribers'),
     members: feature('members'),
     nightShift: feature('nightShift', {user: true, onChange: '_setAdminTheme'}),
 
diff --git a/ghost/admin/app/styles/app-dark.css b/ghost/admin/app/styles/app-dark.css
index 6dde80c01f..4b0d643280 100644
--- a/ghost/admin/app/styles/app-dark.css
+++ b/ghost/admin/app/styles/app-dark.css
@@ -56,7 +56,6 @@
 @import "layouts/error.css";
 @import "layouts/apps.css";
 @import "layouts/packages.css";
-@import "layouts/subscribers.css";
 @import "layouts/labs.css";
 @import "layouts/whats-new.css";
 
@@ -397,10 +396,6 @@ input:focus,
     color: color-mod(#183691 l(+25%));
 }
 
-.subscribers-table table .gh-btn svg {
-    fill: var(--darkgrey);
-}
-
 .id-mailchimp img,
 .id-typeform img,
 .id-buffer img,
diff --git a/ghost/admin/app/styles/app.css b/ghost/admin/app/styles/app.css
index 08845828cd..ee88c08f58 100644
--- a/ghost/admin/app/styles/app.css
+++ b/ghost/admin/app/styles/app.css
@@ -56,7 +56,6 @@
 @import "layouts/error.css";
 @import "layouts/apps.css";
 @import "layouts/packages.css";
-@import "layouts/subscribers.css";
 @import "layouts/labs.css";
 @import "layouts/whats-new.css";
 
diff --git a/ghost/admin/app/styles/layouts/subscribers.css b/ghost/admin/app/styles/layouts/subscribers.css
deleted file mode 100644
index 8043387a97..0000000000
--- a/ghost/admin/app/styles/layouts/subscribers.css
+++ /dev/null
@@ -1,105 +0,0 @@
-/* Subscribers Management /ghost/subscribers/
-/* ---------------------------------------------------------- */
-
-.view-subscribers .view-container {
-    display: flex;
-    flex-direction: row;
-}
-
-
-/* Table (left pane)
-/* ---------------------------------------------------------- */
-
-.subscribers-table {
-    flex-grow: 1;
-    overflow-y: auto;
-    max-height: 100%;
-}
-
-.subscribers-table table {
-    margin: 0;
-}
-
-.subscribers-table th {
-    padding: 4px 0;
-}
-
-.subscribers-table th a {
-    color: var(--midlightgrey);
-    font-size: 1.2rem;
-    font-weight: 500;
-    text-transform: uppercase;
-}
-
-.subscribers-table td {
-    padding: 0;
-    border-top: var(--lightgrey) 1px solid;
-}
-
-.subscribers-table table .gh-btn {
-    visibility: hidden;
-}
-
-.subscribers-table table .gh-btn svg {
-    height: 13px;
-    width: 13px;
-}
-
-.subscribers-table table tr:hover .gh-btn {
-    visibility: visible;
-}
-
-.subscribers-table tbody td:last-of-type {
-    padding-top: 0;
-    padding-bottom: 0;
-    padding-left: 0;
-}
-
-.gh-subscribers-table-email-cell {
-    width: auto;
-}
-
-.gh-subscribers-table-date-cell {
-    width: 194px;
-}
-
-.gh-subscribers-table-status-cell {
-    width: 114px;
-}
-
-.gh-subscribers-table-delete-cell {
-    width: 52px;
-}
-
-
-
-/* Sidebar (right pane)
-/* ---------------------------------------------------------- */
-
-.subscribers-sidebar {
-    width: 350px;
-    border-left: 1px solid #dfe1e3;
-}
-
-.subscribers-import-buttons {
-    display: flex;
-    flex-direction: row;
-}
-
-.subscribers-import-buttons .gh-btn {
-    flex-grow: 1;
-    margin-right: 10px;
-}
-
-.subscribers-import-buttons .gh-btn:last-of-type {
-    margin-right: 0;
-}
-
-
-/* Import modal
-/* ---------------------------------------------------------- */
-
-.subscribers-import-results {
-    margin: 0;
-    width: auto;
-}
diff --git a/ghost/admin/app/templates/components/gh-nav-menu.hbs b/ghost/admin/app/templates/components/gh-nav-menu.hbs
index be72043f6e..0d2bb50551 100644
--- a/ghost/admin/app/templates/components/gh-nav-menu.hbs
+++ b/ghost/admin/app/templates/components/gh-nav-menu.hbs
@@ -56,9 +56,6 @@
                 </li>
             {{/if}}
             <li>{{#link-to "staff" data-test-nav="staff"}}{{svg-jar "staff"}}Staff{{/link-to}}</li>
-            {{#if (and feature.subscribers (gh-user-can-admin session.user))}}
-                <li>{{#link-to "subscribers" data-test-nav="subscribers"}}{{svg-jar "email"}}Subscribers{{/link-to}}</li>
-            {{/if}}
         </ul>
         {{#if (gh-user-can-admin session.user)}}
             <ul class="gh-nav-list gh-nav-settings">
diff --git a/ghost/admin/app/templates/components/modal-delete-subscriber.hbs b/ghost/admin/app/templates/components/modal-delete-subscriber.hbs
deleted file mode 100644
index 8b1f0f5855..0000000000
--- a/ghost/admin/app/templates/components/modal-delete-subscriber.hbs
+++ /dev/null
@@ -1,19 +0,0 @@
-<header class="modal-header" data-test-modal="delete-subscriber">
-    <h1>Are you sure?</h1>
-</header>
-<a class="close" href="" title="Close" {{action "closeModal"}}>{{svg-jar "close"}}<span class="hidden">Close</span></a>
-
-<div class="modal-body">
-    <strong>WARNING:</strong> All data for this subscriber will be deleted. There is no way to recover this.
-</div>
-
-<div class="modal-footer">
-    <button {{action "closeModal"}} class="gh-btn" data-test-button="cancel-delete-subscriber">
-        <span>Cancel</span>
-    </button>
-    {{gh-task-button "Delete"
-        successText="Deleted"
-        task=deleteSubscriber
-        class="gh-btn gh-btn-red gh-btn-icon"
-        data-test-button="confirm-delete-subscriber"}}
-</div>
diff --git a/ghost/admin/app/templates/components/modal-import-subscribers.hbs b/ghost/admin/app/templates/components/modal-import-subscribers.hbs
deleted file mode 100644
index 427ec775a0..0000000000
--- a/ghost/admin/app/templates/components/modal-import-subscribers.hbs
+++ /dev/null
@@ -1,47 +0,0 @@
-<header class="modal-header" data-test-modal="import-subscribers">
-    <h1>
-        {{#if response}}
-            Import Successful
-        {{else}}
-            Import Subscribers
-        {{/if}}
-    </h1>
-</header>
-<a class="close" href="" title="Close" {{action "closeModal"}}>{{svg-jar "close"}}<span class="hidden">Close</span></a>
-
-<div class="modal-body">
-    {{#if response}}
-        <table class="subscribers-import-results">
-            <tr>
-                <td>Imported:</td>
-                <td align="left" data-test-text="import-subscribers-imported">{{response.imported}}</td>
-            </tr>
-            {{#if response.duplicates}}
-                <tr>
-                    <td>Duplicates:</td>
-                    <td align="left" data-test-text="import-subscribers-duplicates">{{response.duplicates}}</td>
-                </tr>
-            {{/if}}
-            {{#if response.invalid}}
-                <tr>
-                    <td>Invalid:</td>
-                    <td align="left" data-test-text="import-subscribers-invalid">{{response.invalid}}</td>
-                </tr>
-            {{/if}}
-        </table>
-    {{else}}
-        {{gh-file-uploader
-            url=uploadUrl
-            paramName="subscribersfile"
-            labelText="Select or drag-and-drop a CSV file."
-            uploadStarted=(action "uploadStarted")
-            uploadFinished=(action "uploadFinished")
-            uploadSuccess=(action "uploadSuccess")}}
-    {{/if}}
-</div>
-
-<div class="modal-footer">
-    <button {{action "closeModal"}} disabled={{closeDisabled}} class="gh-btn" data-test-button="close-import-subscribers">
-        <span>{{#if response}}Close{{else}}Cancel{{/if}}</span>
-    </button>
-</div>
diff --git a/ghost/admin/app/templates/components/modal-new-subscriber.hbs b/ghost/admin/app/templates/components/modal-new-subscriber.hbs
deleted file mode 100644
index 83b1518a04..0000000000
--- a/ghost/admin/app/templates/components/modal-new-subscriber.hbs
+++ /dev/null
@@ -1,44 +0,0 @@
-<header class="modal-header" data-test-modal="new-subscriber">
-    <h1>Add a Subscriber</h1>
-</header>
-{{!-- disable mouseDown so it doesn't trigger focus-out validations --}}
-<a class="close" href="" title="Close" {{action "closeModal"}} {{action (optional noop) on="mouseDown"}}>
-    {{svg-jar "close"}}<span class="hidden">Close</span>
-</a>
-
-<div class="modal-body">
-    <fieldset>
-        {{#gh-form-group errors=subscriber.errors hasValidated=subscriber.hasValidated property="email"}}
-            <label for="new-subscriber-email">Email Address</label>
-            <input type="email"
-                value={{subscriber.email}}
-                oninput={{action "updateEmail" value="target.value"}}
-                id="new-subscriber-email"
-                class="gh-input email"
-                placeholder="Email Address"
-                name="email"
-                autofocus="autofocus"
-                autocapitalize="off"
-                autocorrect="off"
-                data-test-input="new-subscriber-email">
-            {{gh-error-message errors=subscriber.errors property="email" data-test-error="new-subscriber-email"}}
-        {{/gh-form-group}}
-
-    </fieldset>
-</div>
-
-<div class="modal-footer">
-    <button class="gh-btn"
-        {{action "closeModal"}}
-        {{!-- disable mouseDown so it doesn't trigger focus-out validations --}}
-        {{action (optional noop) on="mouseDown"}}
-        data-test-button="cancel-new-subscriber"
-    >
-        <span>Cancel</span>
-    </button>
-    {{gh-task-button "Add"
-        successText="Added"
-        task=addSubscriber
-        class="gh-btn gh-btn-green gh-btn-icon"
-        data-test-button="create-subscriber"}}
-</div>
diff --git a/ghost/admin/app/templates/settings/labs.hbs b/ghost/admin/app/templates/settings/labs.hbs
index c650df506a..8a3319aa69 100644
--- a/ghost/admin/app/templates/settings/labs.hbs
+++ b/ghost/admin/app/templates/settings/labs.hbs
@@ -98,20 +98,6 @@
                     <div class="for-switch">{{gh-feature-flag "nightShift"}}</div>
                 </div>
             </div>
-            <div class="gh-setting {{if feature.members "gh-labs-disabled"}}" data-tooltip="{{if feature.members "Disabled when members is turned on"}}">
-                <div class="gh-setting-content">
-                    <div class="gh-setting-title">Subscribers</div>
-                    <div class="gh-setting-desc">Collect email addresses from your readers, more info in <a
-                            href="https://ghost.org/faq/enable-subscribers-feature/">the docs</a></div>
-                </div>
-                <div class="gh-setting-action">
-                    {{#if feature.members}}
-                        <div class="for-switch">{{gh-feature-flag "subscribers" "disabled"}}</div>
-                    {{else}}
-                        <div class="for-switch">{{gh-feature-flag "subscribers" }}</div>
-                    {{/if}}
-                </div>
-            </div>
             {{#if config.enableDeveloperExperiments}}
                 <div class="gh-setting">
                     <div class="gh-setting-content">
diff --git a/ghost/admin/app/templates/subscribers.hbs b/ghost/admin/app/templates/subscribers.hbs
deleted file mode 100644
index dc50a7470f..0000000000
--- a/ghost/admin/app/templates/subscribers.hbs
+++ /dev/null
@@ -1,100 +0,0 @@
-<section class="gh-canvas">
-    <GhCanvasHeader class="gh-canvas-header">
-        <h2 class="gh-canvas-title" data-test-screen-title>
-            Subscribers
-            <span style="font-weight:200;margin-left:10px;display:inline-block;" data-test-total-subscribers>
-                {{#if this.fetchSubscribers.lastSuccessful}}
-                    ({{this.filteredSubscribers.length}})
-                {{else}}
-                    (Loading...)
-                {{/if}}
-            </span>
-        </h2>
-        <div class="view-actions">
-            {{#link-to "subscribers.import" class="gh-btn gh-btn-white mr2" data-test-link="import-csv"}}<span>Import CSV</span>{{/link-to}}
-            <a href="#" {{action 'exportData'}} class="gh-btn gh-btn-white mr2"><span>Export CSV</span></a>
-            {{#link-to "subscribers.new" class="gh-btn gh-btn-green" data-test-link="add-subscriber"}}<span>Add Subscriber</span>{{/link-to}}
-        </div>
-    </GhCanvasHeader>
-
-    <section class="view-container">
-        <div class="subscribers-table bg-grouped-table br4 shadow-1 pl5 pb2 pt2">
-            <table>
-                <thead>
-                    <tr>
-                        <th class="gh-subscribers-table-email-cell">
-                            {{#link-to class="inline-flex items-center darkgrey" params=(subscribers-query-params "email" this.order this.direction)}}
-                                {{subscribers-sort-icon "email" this.order this.direction}}
-                                Email Address
-                            {{/link-to}}
-                        </th>
-                        <th class="gh-subscribers-table-date-cell">
-                            {{#link-to class="inline-flex items-center darkgrey" params=(subscribers-query-params "created_at" this.order this.direction)}}
-                                {{subscribers-sort-icon "created_at" this.order this.direction}}
-                                Subscription Date
-                            {{/link-to}}
-                        </th>
-                        <th class="gh-subscribers-table-status-cell">
-                            {{#link-to class="inline-flex items-center darkgrey" params=(subscribers-query-params "status" this.order this.direction)}}
-                                {{subscribers-sort-icon "status" this.order this.direction}}
-                                Status
-                            {{/link-to}}
-                        </th>
-                        <th class="gh-subscribers-table-delete-cell"></th>
-                    </tr>
-                </thead>
-            </table>
-            <table>
-                <tbody>
-                    {{#if this.sortedSubscribers}}
-                        <VerticalCollection
-                            @items={{this.sortedSubscribers}}
-                            @key="id"
-                            @containerSelector=".gh-main"
-                            @estimateHeight=34
-                            @bufferSize=30
-                            as |subscriber|
-                        >
-                            <tr>
-                                <td class="gh-subscribers-table-email-cell">
-                                    {{subscriber.email}}
-                                </td>
-                                <td class="gh-subscribers-table-date-cell">
-                                    {{moment-format subscriber.createdAtUTC 'MMMM DD, YYYY'}}
-                                </td>
-                                <td class="gh-subscribers-table-status-cell">
-                                    {{subscriber.status}}
-                                </td>
-                                <td class="gh-subscribers-table-delete-cell">
-                                    <button class="gh-btn gh-btn-link gh-btn-sm" {{action "deleteSubscriber" subscriber}}><span>{{svg-jar "trash"}}</span></button>
-                                </td>
-                            </tr>
-                        </VerticalCollection>
-                    {{else}}
-                        <tr>
-                            <td colspan="4">
-                                {{#if this.fetchSubscribers.isRunning}}
-                                    <div class="relative h50"><GhLoadingSpinner /></div>
-                                {{else}}
-                                    {{!-- match height to delete button height for consistent spacing --}}
-                                    <span class="dib" style="line-height: 33px">No subscribers found.</span>
-                                {{/if}}
-                            </td>
-                        </tr>
-                    {{/if}}
-                </tbody>
-            </table>
-        </div>
-    </section>
-</section>
-
-{{#if this.subscriberToDelete}}
-    <GhFullscreenModal
-        @modal="delete-subscriber"
-        @model={{this.subscriberToDelete}}
-        @confirm={{action "confirmDeleteSubscriber"}}
-        @close={{action "cancelDeleteSubscriber"}}
-        @modifier="action wide" />
-{{/if}}
-
-{{outlet}}
diff --git a/ghost/admin/app/templates/subscribers/import.hbs b/ghost/admin/app/templates/subscribers/import.hbs
deleted file mode 100644
index 3ccf61409b..0000000000
--- a/ghost/admin/app/templates/subscribers/import.hbs
+++ /dev/null
@@ -1,4 +0,0 @@
-{{gh-fullscreen-modal "import-subscribers"
-    close=(action "close")
-    confirm=(action "fetchNewSubscribers")
-    modifier="action wide"}}
diff --git a/ghost/admin/app/templates/subscribers/new.hbs b/ghost/admin/app/templates/subscribers/new.hbs
deleted file mode 100644
index 9ed684b93b..0000000000
--- a/ghost/admin/app/templates/subscribers/new.hbs
+++ /dev/null
@@ -1,5 +0,0 @@
-{{gh-fullscreen-modal "new-subscriber"
-    model=subscriber
-    confirm=(route-action "save")
-    close=(route-action "cancel")
-    modifier="action wide"}}
diff --git a/ghost/admin/mirage/config.js b/ghost/admin/mirage/config.js
index 0472316286..1800c2a9c6 100644
--- a/ghost/admin/mirage/config.js
+++ b/ghost/admin/mirage/config.js
@@ -10,7 +10,6 @@ import mockRoles from './config/roles';
 import mockSettings from './config/settings';
 import mockSite from './config/site';
 import mockSlugs from './config/slugs';
-import mockSubscribers from './config/subscribers';
 import mockTags from './config/tags';
 import mockThemes from './config/themes';
 import mockUploads from './config/uploads';
@@ -65,7 +64,6 @@ export function testConfig() {
     mockSettings(this);
     mockSite(this);
     mockSlugs(this);
-    mockSubscribers(this);
     mockTags(this);
     mockThemes(this);
     mockUploads(this);
diff --git a/ghost/admin/mirage/config/subscribers.js b/ghost/admin/mirage/config/subscribers.js
deleted file mode 100644
index 2ab36cbe91..0000000000
--- a/ghost/admin/mirage/config/subscribers.js
+++ /dev/null
@@ -1,50 +0,0 @@
-/* eslint-disable camelcase */
-import {Response} from 'ember-cli-mirage';
-import {paginatedResponse} from '../utils';
-
-export default function mockSubscribers(server) {
-    server.get('/subscribers/', paginatedResponse('subscribers'));
-
-    server.post('/subscribers/', function ({subscribers}) {
-        let attrs = this.normalizedRequestAttrs();
-        let subscriber = subscribers.findBy({email: attrs.email});
-
-        if (subscriber) {
-            return new Response(422, {}, {
-                errors: [{
-                    type: 'ValidationError',
-                    message: 'Validation error, cannot save subscriber.',
-                    context: 'Email address is already subscribed.',
-                    property: null
-                }]
-            });
-        } else {
-            attrs.createdAt = new Date();
-            attrs.createdBy = 0;
-
-            return subscribers.create(attrs);
-        }
-    });
-
-    server.put('/subscribers/:id/');
-
-    server.post('/subscribers/csv/', function () {
-        // NB: we get a raw FormData object with no way to inspect it in Chrome
-        // until version 50 adds the additional read methods
-        // https://developer.mozilla.org/en-US/docs/Web/API/FormData#Browser_compatibility
-
-        server.createList('subscriber', 50);
-
-        return {
-            meta: {
-                stats: {
-                    imported: 50,
-                    duplicates: 3,
-                    invalid: 2
-                }
-            }
-        };
-    });
-
-    server.del('/subscribers/:id/');
-}
diff --git a/ghost/admin/mirage/factories/subscriber.js b/ghost/admin/mirage/factories/subscriber.js
deleted file mode 100644
index d4c1559011..0000000000
--- a/ghost/admin/mirage/factories/subscriber.js
+++ /dev/null
@@ -1,20 +0,0 @@
-import faker from 'faker';
-import moment from 'moment';
-import {Factory} from 'ember-cli-mirage';
-
-let randomDate = function randomDate(start = moment().subtract(30, 'days').toDate(), end = new Date()) {
-    return new Date(start.getTime() + Math.random() * (end.getTime() - start.getTime()));
-};
-
-let statuses = ['pending', 'subscribed'];
-
-export default Factory.extend({
-    name() { return `${faker.name.firstName()} ${faker.name.lastName()}`; },
-    email: faker.internet.email,
-    status() { return statuses[Math.floor(Math.random() * statuses.length)]; },
-    createdAt() { return randomDate(); },
-    updatedAt: null,
-    createdBy: 0,
-    updatedBy: null,
-    unsubscribedAt: null
-});
diff --git a/ghost/admin/mirage/fixtures/configs.js b/ghost/admin/mirage/fixtures/configs.js
index 8d42142d51..c96a677f8e 100644
--- a/ghost/admin/mirage/fixtures/configs.js
+++ b/ghost/admin/mirage/fixtures/configs.js
@@ -3,7 +3,7 @@ export default [{
     database: 'mysql',
     enableDeveloperExperiments: true,
     environment: 'development',
-    labs: {subscribers: false},
+    labs: {},
     mail: 'SMTP',
     version: '2.15.0',
     useGravatar: 'true'
diff --git a/ghost/admin/mirage/fixtures/settings.js b/ghost/admin/mirage/fixtures/settings.js
index 99be4862ff..736cdd4ef9 100644
--- a/ghost/admin/mirage/fixtures/settings.js
+++ b/ghost/admin/mirage/fixtures/settings.js
@@ -73,7 +73,7 @@ export default [
     {
         id: 12,
         key: 'labs',
-        value: '{"subscribers":true}',
+        value: '{}',
         type: 'blog',
         created_at: '2015-01-12T18:29:01.000Z',
         created_by: 1,
diff --git a/ghost/admin/mirage/scenarios/default.js b/ghost/admin/mirage/scenarios/default.js
index 5f584b5fe3..8ebf793537 100644
--- a/ghost/admin/mirage/scenarios/default.js
+++ b/ghost/admin/mirage/scenarios/default.js
@@ -4,7 +4,6 @@ export default function (server) {
 
     // server.createList('contact', 10);
 
-    server.createList('subscriber', 125);
     server.createList('tag', 100);
 
     server.create('integration', {name: 'Demo'});
diff --git a/ghost/admin/tests/acceptance/error-handling-test.js b/ghost/admin/tests/acceptance/error-handling-test.js
index 9706cd5413..889b4830ab 100644
--- a/ghost/admin/tests/acceptance/error-handling-test.js
+++ b/ghost/admin/tests/acceptance/error-handling-test.js
@@ -3,7 +3,6 @@ import {authenticateSession} from 'ember-simple-auth/test-support';
 import {beforeEach, describe, it} from 'mocha';
 import {click, currentRouteName, fillIn, find, findAll, visit} from '@ember/test-helpers';
 import {expect} from 'chai';
-import {fileUpload} from '../helpers/file-upload';
 import {setupApplicationTest} from 'ember-mocha';
 import {setupMirage} from 'ember-cli-mirage/test-support';
 import {versionMismatchResponse} from 'ghost-admin/mirage/utils';
@@ -80,18 +79,6 @@ describe('Acceptance: Error Handling', function () {
                 expect(findAll('.gh-alert').length).to.equal(1);
                 expect(find('.gh-alert').textContent).to.match(/refresh/);
             });
-
-            it('can be triggered when passed in to a component', async function () {
-                this.server.post('/subscribers/csv/', versionMismatchResponse);
-
-                await visit('/subscribers');
-                await click('[data-test-link="import-csv"]');
-                await fileUpload('.fullscreen-modal input[type="file"]', ['test'], {name: 'test.csv'});
-
-                // alert is shown
-                expect(findAll('.gh-alert').length).to.equal(1);
-                expect(find('.gh-alert').textContent).to.match(/refresh/);
-            });
         });
 
         describe('logged out', function () {
diff --git a/ghost/admin/tests/acceptance/subscribers-test.js b/ghost/admin/tests/acceptance/subscribers-test.js
deleted file mode 100644
index 56c800e158..0000000000
--- a/ghost/admin/tests/acceptance/subscribers-test.js
+++ /dev/null
@@ -1,208 +0,0 @@
-import {authenticateSession, invalidateSession} from 'ember-simple-auth/test-support';
-import {beforeEach, describe, it} from 'mocha';
-import {click, currentRouteName, currentURL, fillIn, find, findAll} from '@ember/test-helpers';
-import {expect} from 'chai';
-import {fileUpload} from '../helpers/file-upload';
-import {findAllWithText} from '../helpers/find';
-import {setupApplicationTest} from 'ember-mocha';
-import {setupMirage} from 'ember-cli-mirage/test-support';
-import {visit} from '../helpers/visit';
-
-describe('Acceptance: Subscribers', function () {
-    let hooks = setupApplicationTest();
-    setupMirage(hooks);
-
-    it('redirects to signin when not authenticated', async function () {
-        await invalidateSession();
-        await visit('/subscribers');
-
-        expect(currentURL()).to.equal('/signin');
-    });
-
-    it('redirects editors to posts', async function () {
-        let role = this.server.create('role', {name: 'Editor'});
-        this.server.create('user', {roles: [role]});
-
-        await authenticateSession();
-        await visit('/subscribers');
-
-        expect(currentURL()).to.equal('/site');
-        expect(find('[data-test-nav="subscribers"]'), 'sidebar link')
-            .to.not.exist;
-    });
-
-    it('redirects authors to posts', async function () {
-        let role = this.server.create('role', {name: 'Author'});
-        this.server.create('user', {roles: [role]});
-
-        await authenticateSession();
-        await visit('/subscribers');
-
-        expect(currentURL()).to.equal('/site');
-        expect(find('[data-test-nav="subscribers"]'), 'sidebar link')
-            .to.not.exist;
-    });
-
-    it('redirects contributors to posts', async function () {
-        let role = this.server.create('role', {name: 'Contributor'});
-        this.server.create('user', {roles: [role]});
-
-        await authenticateSession();
-        await visit('/subscribers');
-
-        expect(currentURL()).to.equal('/site');
-        expect(find('[data-test-nav="subscribers"]'), 'sidebar link')
-            .to.not.exist;
-    });
-
-    describe('an admin', function () {
-        beforeEach(async function () {
-            let role = this.server.create('role', {name: 'Administrator'});
-            this.server.create('user', {roles: [role]});
-
-            return await authenticateSession();
-        });
-
-        it('can manage subscribers', async function () {
-            this.server.createList('subscriber', 40);
-
-            await visit('/');
-            await click('[data-test-nav="subscribers"]');
-
-            // it navigates to the correct page
-            expect(currentRouteName()).to.equal('subscribers.index');
-
-            // it has correct page title
-            expect(document.title, 'page title')
-                .to.equal('Subscribers - Test Blog');
-
-            // it loads subscribers
-            // NOTE: we use vertical-collection for occlusion so the max number of rows can be less than the
-            // number of subscribers that are loaded
-            expect(findAll('.subscribers-table tbody tr').length, 'number of subscriber rows')
-                .to.be.at.least(30);
-
-            // it shows the total number of subscribers
-            expect(find('[data-test-total-subscribers]').textContent.trim(), 'displayed subscribers total')
-                .to.equal('(40)');
-
-            // it defaults to sorting by created_at desc
-            let [lastRequest] = this.server.pretender.handledRequests.slice(-1);
-            expect(lastRequest.queryParams.order).to.equal('created_at desc');
-
-            // click the add subscriber button
-            await click('[data-test-link="add-subscriber"]');
-
-            // it displays the add subscriber modal
-            expect(find('[data-test-modal="new-subscriber"]'), 'add subscriber modal displayed')
-                .to.exist;
-
-            // cancel the modal
-            await click('[data-test-button="cancel-new-subscriber"]');
-
-            // it closes the add subscriber modal
-            expect(find('[data-test-modal]'), 'add subscriber modal displayed after cancel')
-                .to.not.exist;
-
-            // save a new subscriber
-            await click('[data-test-link="add-subscriber"]');
-            await fillIn('[data-test-input="new-subscriber-email"]', 'test@example.com');
-            await click('[data-test-button="create-subscriber"]');
-
-            // the add subscriber modal is closed
-            expect(find('[data-test-modal]'), 'add subscriber modal displayed after save')
-                .to.not.exist;
-
-            // the subscriber is added to the table
-            expect(find('.subscribers-table tbody tr td'), 'first email in list after addition')
-                .to.contain.text('test@example.com');
-
-            // the table is scrolled to the top
-            // TODO: implement scroll to new record after addition
-            // expect(find('.subscribers-table').scrollTop(), 'scroll position after addition')
-            //     .to.equal(0);
-
-            // the subscriber total is updated
-            expect(find('[data-test-total-subscribers]'), 'subscribers total after addition')
-                .to.have.trimmed.text('(41)');
-
-            // saving a duplicate subscriber
-            await click('[data-test-link="add-subscriber"]');
-            await fillIn('[data-test-input="new-subscriber-email"]', 'test@example.com');
-            await click('[data-test-button="create-subscriber"]');
-
-            // the validation error is displayed
-            expect(find('[data-test-error="new-subscriber-email"]'), 'duplicate email validation')
-                .to.have.trimmed.text('Email address is already subscribed.');
-
-            // the subscriber is not added to the table
-            expect(findAllWithText('td.gh-subscribers-table-email-cell', 'test@example.com').length, 'number of "test@example.com rows"')
-                .to.equal(1);
-
-            // the subscriber total is unchanged
-            expect(find('[data-test-total-subscribers]'), 'subscribers total after failed add')
-                .to.have.trimmed.text('(41)');
-
-            // deleting a subscriber
-            await click('[data-test-button="cancel-new-subscriber"]');
-            await click('.subscribers-table tbody tr:first-of-type button:last-of-type');
-
-            // it displays the delete subscriber modal
-            expect(find('[data-test-modal="delete-subscriber"]'), 'delete subscriber modal displayed')
-                .to.exist;
-
-            // cancel the modal
-            await click('[data-test-button="cancel-delete-subscriber"]');
-
-            // it closes the add subscriber modal
-            expect(find('[data-test-modal]'), 'delete subscriber modal displayed after cancel')
-                .to.not.exist;
-
-            await click('.subscribers-table tbody tr:first-of-type button:last-of-type');
-            await click('[data-test-button="confirm-delete-subscriber"]');
-
-            // the add subscriber modal is closed
-            expect(find('[data-test-modal]'), 'delete subscriber modal displayed after confirm')
-                .to.not.exist;
-
-            // the subscriber is removed from the table
-            expect(find('.subscribers-table tbody td.gh-subscribers-table-email-cell'), 'first email in list after addition')
-                .to.not.have.trimmed.text('test@example.com');
-
-            // the subscriber total is updated
-            expect(find('[data-test-total-subscribers]'), 'subscribers total after addition')
-                .to.have.trimmed.text('(40)');
-
-            // click the import subscribers button
-            await click('[data-test-link="import-csv"]');
-
-            // it displays the import subscribers modal
-            expect(find('[data-test-modal="import-subscribers"]'), 'import subscribers modal displayed')
-                .to.exist;
-            expect(find('.fullscreen-modal input[type="file"]'), 'import modal contains file input')
-                .to.exist;
-
-            // cancel the modal
-            await click('[data-test-button="close-import-subscribers"]');
-
-            // it closes the import subscribers modal
-            expect(find('[data-test-modal]'), 'import subscribers modal displayed after cancel')
-                .to.not.exist;
-
-            await click('[data-test-link="import-csv"]');
-            await fileUpload('.fullscreen-modal input[type="file"]', ['test'], {name: 'test.csv'});
-
-            // modal title changes
-            expect(find('[data-test-modal="import-subscribers"] h1'), 'import modal title after import')
-                .to.have.trimmed.text('Import Successful');
-
-            // modal button changes
-            expect(find('[data-test-button="close-import-subscribers"]'), 'import modal button text after import')
-                .to.have.trimmed.text('Close');
-
-            // subscriber total is updated
-            expect(find('[data-test-total-subscribers]'), 'subscribers total after import')
-                .to.have.trimmed.text('(90)');
-        });
-    });
-});
diff --git a/ghost/admin/tests/unit/validators/subscriber-test.js b/ghost/admin/tests/unit/validators/subscriber-test.js
deleted file mode 100644
index 21dbdfce04..0000000000
--- a/ghost/admin/tests/unit/validators/subscriber-test.js
+++ /dev/null
@@ -1,73 +0,0 @@
-import EmberObject from '@ember/object';
-import ValidationEngine from 'ghost-admin/mixins/validation-engine';
-import {
-    describe,
-    it
-} from 'mocha';
-import {expect} from 'chai';
-import {run} from '@ember/runloop';
-
-const Subscriber = EmberObject.extend(ValidationEngine, {
-    validationType: 'subscriber',
-
-    email: null
-});
-
-describe('Unit: Validator: subscriber', function () {
-    it('validates email by default', function () {
-        let subscriber = Subscriber.create({});
-        let properties = subscriber.get('validators.subscriber.properties');
-
-        expect(properties, 'properties').to.include('email');
-    });
-
-    it('passes with a valid email', function () {
-        let subscriber = Subscriber.create({email: 'test@example.com'});
-        let passed = false;
-
-        run(() => {
-            subscriber.validate({property: 'email'}).then(() => {
-                passed = true;
-            });
-        });
-
-        expect(passed, 'passed').to.be.true;
-        expect(subscriber.get('hasValidated'), 'hasValidated').to.include('email');
-    });
-
-    it('validates email presence', function () {
-        let subscriber = Subscriber.create({});
-        let passed = false;
-
-        run(() => {
-            subscriber.validate({property: 'email'}).then(() => {
-                passed = true;
-            });
-        });
-
-        let emailErrors = subscriber.get('errors').errorsFor('email').get(0);
-        expect(emailErrors.attribute, 'errors.email.attribute').to.equal('email');
-        expect(emailErrors.message, 'errors.email.message').to.equal('Please enter an email.');
-
-        expect(passed, 'passed').to.be.false;
-        expect(subscriber.get('hasValidated'), 'hasValidated').to.include('email');
-    });
-
-    it('validates email', function () {
-        let subscriber = Subscriber.create({email: 'foo'});
-        let passed = false;
-
-        run(() => {
-            subscriber.validate({property: 'email'}).then(() => {
-                passed = true;
-            });
-        });
-
-        let emailErrors = subscriber.get('errors').errorsFor('email').get(0);
-        expect(emailErrors.attribute, 'errors.email.attribute').to.equal('email');
-        expect(emailErrors.message, 'errors.email.message').to.equal('Invalid email.');
-
-        expect(passed, 'passed').to.be.false;
-        expect(subscriber.get('hasValidated'), 'hasValidated').to.include('email');
-    });
-});