From 18f4748e8b0f9d05e02a9a6e68f2fde7c3eeb18c Mon Sep 17 00:00:00 2001
From: Simon Backx <simon@ghost.org>
Date: Thu, 21 Apr 2022 15:48:25 +0200
Subject: [PATCH] Fixed tests partially for updated member counts

no issue

Also moves some reused test methods to the test helpers folder (wasn't able to move it to the fixtures because too many tests were failing):
- enableNewsletters helper
- enableStripe helper
- enableMailgun helper
---
 .../gh-members-recipient-select.hbs           |  4 +--
 ghost/admin/mirage/config/members.js          |  2 +-
 ghost/admin/tests/acceptance/editor-test.js   | 34 +++++++++----------
 .../tests/acceptance/members/details-test.js  | 20 +++--------
 .../tests/acceptance/members/filter-test.js   | 15 +++-----
 ghost/admin/tests/helpers/mailgun.js          | 13 +++++++
 ghost/admin/tests/helpers/newsletters.js      |  5 +++
 ghost/admin/tests/helpers/stripe.js           | 12 +++++++
 8 files changed, 58 insertions(+), 47 deletions(-)
 create mode 100644 ghost/admin/tests/helpers/mailgun.js
 create mode 100644 ghost/admin/tests/helpers/newsletters.js
 create mode 100644 ghost/admin/tests/helpers/stripe.js

diff --git a/ghost/admin/app/components/gh-members-recipient-select.hbs b/ghost/admin/app/components/gh-members-recipient-select.hbs
index 290b4ab45c..a2eb7b0177 100644
--- a/ghost/admin/app/components/gh-members-recipient-select.hbs
+++ b/ghost/admin/app/components/gh-members-recipient-select.hbs
@@ -1,5 +1,5 @@
 <div class="gh-publishmenu-send-to-option">
-    <p>Free members <span class="gh-publishmenu-emailcount">{{this.freeMemberCountLabel}}</span></p>
+    <p>Free members <span class="gh-publishmenu-emailcount" data-test-email-count="free-members">{{this.freeMemberCountLabel}}</span></p>
     <div class="for-switch x-small {{if @disabled "disabled"}}">
         <label class="switch" for="send-email-to-free">
             <input
@@ -18,7 +18,7 @@
 </div>
 {{#if this.isPaidAvailable}}
     <div class="gh-publishmenu-send-to-option">
-        <p>Paid members <span class="gh-publishmenu-emailcount">{{this.paidMemberCountLabel}}</span></p>
+        <p>Paid members <span class="gh-publishmenu-emailcount" data-test-email-count="paid-members">{{this.paidMemberCountLabel}}</span></p>
         <div class="for-switch x-small {{if @disabled "disabled"}}">
             <label class="switch" for="send-email-to-paid">
                 <input
diff --git a/ghost/admin/mirage/config/members.js b/ghost/admin/mirage/config/members.js
index 8769dfbda9..f3a498fe99 100644
--- a/ghost/admin/mirage/config/members.js
+++ b/ghost/admin/mirage/config/members.js
@@ -97,7 +97,7 @@ export default function mockMembers(server) {
                     });
 
                     // similar deal for associated models
-                    ['labels', 'products', 'subscriptions'].forEach((association) => {
+                    ['labels', 'products', 'subscriptions', 'newsletters'].forEach((association) => {
                         serializedMember[association] = [];
 
                         member[association].models.forEach((associatedModel) => {
diff --git a/ghost/admin/tests/acceptance/editor-test.js b/ghost/admin/tests/acceptance/editor-test.js
index b64018421a..7b5af1a206 100644
--- a/ghost/admin/tests/acceptance/editor-test.js
+++ b/ghost/admin/tests/acceptance/editor-test.js
@@ -6,11 +6,14 @@ import {authenticateSession, invalidateSession} from 'ember-simple-auth/test-sup
 import {beforeEach, describe, it} from 'mocha';
 import {blur, click, currentRouteName, currentURL, fillIn, find, findAll, triggerEvent} from '@ember/test-helpers';
 import {datepickerSelect} from 'ember-power-datepicker/test-support';
+import {enableMailgun} from '../helpers/mailgun';
+import {enableNewsletters} from '../helpers/newsletters';
 import {expect} from 'chai';
 import {selectChoose} from 'ember-power-select/test-support';
 import {setupApplicationTest} from 'ember-mocha';
 import {setupMirage} from 'ember-cli-mirage/test-support';
 import {visit} from '../helpers/visit';
+import { enableStripe } from '../helpers/stripe';
 
 // TODO: update ember-power-datepicker to expose modern test helpers
 // https://github.com/cibernox/ember-power-datepicker/issues/30
@@ -841,7 +844,7 @@ describe('Acceptance: Editor', function () {
         beforeEach(async function () {
             const role = this.server.create('role', {name: 'Administrator'});
             user = this.server.create('user', {roles: [role]});
-
+            this.server.loadFixtures('settings');
             return await authenticateSession();
         });
 
@@ -866,24 +869,16 @@ describe('Acceptance: Editor', function () {
         // BUG: re-scheduling a send-only post unexpectedly switched to publish+send
         // https://github.com/TryGhost/Ghost/issues/14354
         it('can re-schedule an email-only post', async function () {
-            // enable email functionality
-            this.server.db.settings.find({key: 'mailgun_api_key'})
-                ? this.server.db.settings.update({key: 'mailgun_api_key'}, {value: 'MAILGUN_API_KEY'})
-                : this.server.create('setting', {key: 'mailgun_api_key', value: 'MAILGUN_API_KEY', group: 'email'});
+            // Enable newsletters (extra confirmation step)
+            enableMailgun(this.server);
+            enableNewsletters(this.server, true);
 
-            this.server.db.settings.find({key: 'mailgun_domain'})
-                ? this.server.db.settings.update({key: 'mailgun_domain'}, {value: 'MAILGUN_DOMAIN'})
-                : this.server.create('setting', {key: 'mailgun_domain', value: 'MAILGUN_DOMAIN', group: 'email'});
+            // Enable stripe to also show paid members breakdown
+            enableStripe(this.server);
 
-            this.server.db.settings.find({key: 'mailgun_base_url'})
-                ? this.server.db.settings.update({key: 'mailgun_base_url'}, {value: 'MAILGUN_BASE_URL'})
-                : this.server.create('setting', {key: 'mailgun_base_url', value: 'MAILGUN_BASE_URL', group: 'email'});
-
-            this.server.db.settings.find({key: 'editor_default_email_recipients'})
-                ? this.server.db.settings.update({key: 'editor_default_email_recipients'}, {value: 'visibility'})
-                : this.server.create('setting', {key: 'editor_default_email_recipients', value: 'visibility', group: 'editor'});
-
-            this.server.createList('member', 4);
+            const newsletter = this.server.create('newsletter', {status: 'active'});
+            this.server.createList('member', 4, {status: 'free', newsletters: [newsletter]});
+            this.server.createList('member', 2, {status: 'paid', newsletters: [newsletter]});
 
             const post = this.server.create('post', {status: 'draft', authors: [user]});
 
@@ -894,6 +889,11 @@ describe('Acceptance: Editor', function () {
             await selectChoose('[data-test-distribution-action-select]', 'send');
             await click('[data-test-publishmenu-scheduled-option]');
             await datepickerSelect('[data-test-publishmenu-draft] [data-test-date-time-picker-datepicker]', new Date(scheduledTime.format().replace(/\+.*$/, '')));
+            
+            // Expect 4 free and 2 paid recipients here
+            expect(find('[data-test-email-count="free-members"]')).to.contain.text('4');
+            expect(find('[data-test-email-count="paid-members"]')).to.contain.text('2');
+            
             await click('[data-test-publishmenu-save]');
             await click('[data-test-button="confirm-schedule"]');
 
diff --git a/ghost/admin/tests/acceptance/members/details-test.js b/ghost/admin/tests/acceptance/members/details-test.js
index b0a6754434..29d36a87a6 100644
--- a/ghost/admin/tests/acceptance/members/details-test.js
+++ b/ghost/admin/tests/acceptance/members/details-test.js
@@ -1,6 +1,8 @@
 import {authenticateSession} from 'ember-simple-auth/test-support';
 import {click, currentURL, find, findAll} from '@ember/test-helpers';
 import {enableLabsFlag} from '../../helpers/labs-flag';
+import {enableNewsletters} from '../../helpers/newsletters';
+import {enableStripe} from '../../helpers/stripe';
 import {expect} from 'chai';
 import {setupApplicationTest} from 'ember-mocha';
 import {setupMirage} from 'ember-cli-mirage/test-support';
@@ -20,22 +22,8 @@ describe('Acceptance: Member details', function () {
         enableLabsFlag(this.server, 'membersTimeFilters');
         enableLabsFlag(this.server, 'multipleProducts');
 
-        // test with stripe connected and email turned on
-        // TODO: add these settings to default fixtures
-        this.server.db.settings.find({key: 'stripe_connect_account_id'})
-            ? this.server.db.settings.update({key: 'stripe_connect_account_id'}, {value: 'stripe_account_id'})
-            : this.server.create('setting', {key: 'stripe_connect_account_id', value: 'stripe_account_id', group: 'members'});
-        // needed for membersUtils.isStripeEnabled
-        this.server.db.settings.find({key: 'stripe_connect_secret_key'})
-            ? this.server.db.settings.update({key: 'stripe_connect_secret_key'}, {value: 'stripe_secret_key'})
-            : this.server.create('setting', {key: 'stripe_connect_secret_key', value: 'stripe_secret_key', group: 'members'});
-        this.server.db.settings.find({key: 'stripe_connect_publishable_key'})
-            ? this.server.db.settings.update({key: 'stripe_connect_publishable_key'}, {value: 'stripe_secret_key'})
-            : this.server.create('setting', {key: 'stripe_connect_publishable_key', value: 'stripe_secret_key', group: 'members'});
-
-        this.server.db.settings.find({key: 'editor_default_email_recipients'})
-            ? this.server.db.settings.update({key: 'editor_default_email_recipients'}, {value: 'visibility'})
-            : this.server.create('setting', {key: 'editor_default_email_recipients', value: 'visibility', group: 'editor'});
+        enableStripe(this.server);
+        enableNewsletters(this.server, true);
 
         // add a default product that complimentary plans can be assigned to
         product = this.server.create('product', {
diff --git a/ghost/admin/tests/acceptance/members/filter-test.js b/ghost/admin/tests/acceptance/members/filter-test.js
index cb5487cf98..c7bea59772 100644
--- a/ghost/admin/tests/acceptance/members/filter-test.js
+++ b/ghost/admin/tests/acceptance/members/filter-test.js
@@ -3,7 +3,8 @@ import sinon from 'sinon';
 import {authenticateSession} from 'ember-simple-auth/test-support';
 import {blur, click, currentURL, fillIn, find, findAll, focus} from '@ember/test-helpers';
 import {datepickerSelect} from 'ember-power-datepicker/test-support';
-import {enableLabsFlag} from '../../helpers/labs-flag';
+import {enableNewsletters} from '../../helpers/newsletters';
+import {enableStripe} from '../../helpers/stripe';
 import {expect} from 'chai';
 import {selectChoose} from 'ember-power-select/test-support/helpers';
 import {setupApplicationTest} from 'ember-mocha';
@@ -19,17 +20,9 @@ describe('Acceptance: Members filtering', function () {
     beforeEach(async function () {
         this.server.loadFixtures('configs');
         this.server.loadFixtures('settings');
-        enableLabsFlag(this.server, 'multipleProducts');
+        enableStripe(this.server);
+        enableNewsletters(this.server, true);
 
-        // test with stripe connected and email turned on
-        // TODO: add these settings to default fixtures
-        this.server.db.settings.find({key: 'stripe_connect_account_id'})
-            ? this.server.db.settings.update({key: 'stripe_connect_account_id'}, {value: 'stripe_connected'})
-            : this.server.create('setting', {key: 'stripe_connect_account_id', value: 'stripe_connected', group: 'members'});
-
-        this.server.db.settings.find({key: 'editor_default_email_recipients'})
-            ? this.server.db.settings.update({key: 'editor_default_email_recipients'}, {value: 'visibility'})
-            : this.server.create('setting', {key: 'editor_default_email_recipients', value: 'visibility', group: 'editor'});
 
         let role = this.server.create('role', {name: 'Owner'});
         this.server.create('user', {roles: [role]});
diff --git a/ghost/admin/tests/helpers/mailgun.js b/ghost/admin/tests/helpers/mailgun.js
new file mode 100644
index 0000000000..ab537eff7f
--- /dev/null
+++ b/ghost/admin/tests/helpers/mailgun.js
@@ -0,0 +1,13 @@
+export function enableMailgun(server) {
+    server.db.settings.find({key: 'mailgun_api_key'})
+        ? server.db.settings.update({key: 'mailgun_api_key'}, {value: 'MAILGUN_API_KEY'})
+        : server.create('setting', {key: 'mailgun_api_key', value: 'MAILGUN_API_KEY', group: 'email'});
+
+    server.db.settings.find({key: 'mailgun_domain'})
+        ? server.db.settings.update({key: 'mailgun_domain'}, {value: 'MAILGUN_DOMAIN'})
+        : server.create('setting', {key: 'mailgun_domain', value: 'MAILGUN_DOMAIN', group: 'email'});
+
+    server.db.settings.find({key: 'mailgun_base_url'})
+        ? server.db.settings.update({key: 'mailgun_base_url'}, {value: 'MAILGUN_BASE_URL'})
+        : server.create('setting', {key: 'mailgun_base_url', value: 'MAILGUN_BASE_URL', group: 'email'});
+}
diff --git a/ghost/admin/tests/helpers/newsletters.js b/ghost/admin/tests/helpers/newsletters.js
new file mode 100644
index 0000000000..20d2802e23
--- /dev/null
+++ b/ghost/admin/tests/helpers/newsletters.js
@@ -0,0 +1,5 @@
+export function enableNewsletters(server, enabled) {
+    server.db.settings.find({key: 'editor_default_email_recipients'})
+        ? server.db.settings.update({key: 'editor_default_email_recipients'}, {value: enabled ? 'visibility' : 'disabled'})
+        : server.create('setting', {key: 'editor_default_email_recipients', value: enabled ? 'visibility' : 'disabled', group: 'editor'});
+}
diff --git a/ghost/admin/tests/helpers/stripe.js b/ghost/admin/tests/helpers/stripe.js
new file mode 100644
index 0000000000..4871917e8b
--- /dev/null
+++ b/ghost/admin/tests/helpers/stripe.js
@@ -0,0 +1,12 @@
+export function enableStripe(server) {
+    server.db.settings.find({key: 'stripe_connect_account_id'})
+        ? server.db.settings.update({key: 'stripe_connect_account_id'}, {value: 'stripe_account_id'})
+        : server.create('setting', {key: 'stripe_connect_account_id', value: 'stripe_account_id', group: 'members'});
+    // needed for membersUtils.isStripeEnabled
+    server.db.settings.find({key: 'stripe_connect_secret_key'})
+        ? server.db.settings.update({key: 'stripe_connect_secret_key'}, {value: 'stripe_secret_key'})
+        : server.create('setting', {key: 'stripe_connect_secret_key', value: 'stripe_secret_key', group: 'members'});
+    server.db.settings.find({key: 'stripe_connect_publishable_key'})
+        ? server.db.settings.update({key: 'stripe_connect_publishable_key'}, {value: 'stripe_secret_key'})
+        : server.create('setting', {key: 'stripe_connect_publishable_key', value: 'stripe_secret_key', group: 'members'});
+}