From eee3a9aa907e0337560ec137c52588e12197f132 Mon Sep 17 00:00:00 2001 From: Simon Backx Date: Mon, 16 May 2022 17:25:03 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A5=20Removed=20multipleProducts,=20ti?= =?UTF-8?q?erWelcomePages,=20and=20tierName=20flags?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit refs https://github.com/TryGhost/Team/issues/1616 --- .../components/gh-members-segment-select.js | 38 +++-- .../admin/app/components/gh-portal-links.hbs | 4 +- .../app/components/gh-post-settings-menu.hbs | 35 ++--- .../visibility-segment-select.js | 40 +++-- .../app/components/gh-psm-visibility-input.js | 11 +- ghost/admin/app/components/members/filter.js | 2 +- .../app/components/modal-enable-tiers.hbs | 13 -- .../app/components/modal-enable-tiers.js | 23 --- .../app/components/modal-portal-settings.hbs | 93 +++++------- .../app/components/modal-portal-settings.js | 13 +- ghost/admin/app/components/modal-tier.hbs | 34 ++--- .../settings/members-default-post-access.js | 20 +-- .../app/components/tiers/segment-select.js | 40 +++-- ghost/admin/app/controllers/offer.js | 9 +- ghost/admin/app/controllers/settings/labs.js | 6 - .../app/controllers/settings/membership.js | 39 ++--- ghost/admin/app/services/feature.js | 3 - ghost/admin/app/services/members-utils.js | 2 +- ghost/admin/app/templates/offer.hbs | 4 - ghost/admin/app/templates/offers.hbs | 6 +- ghost/admin/app/templates/settings/labs.hbs | 6 - .../app/templates/settings/membership.hbs | 139 +++--------------- ghost/admin/mirage/fixtures/settings.js | 6 +- ghost/admin/tests/acceptance/editor-test.js | 2 - .../tests/acceptance/members/details-test.js | 1 - .../tests/acceptance/members/filter-test.js | 2 - .../acceptance/settings/membership-test.js | 4 - .../acceptance/settings/newsletters-test.js | 6 +- .../gh-psm-visibility-input-test.js | 4 +- 29 files changed, 182 insertions(+), 423 deletions(-) delete mode 100644 ghost/admin/app/components/modal-enable-tiers.hbs delete mode 100644 ghost/admin/app/components/modal-enable-tiers.js diff --git a/ghost/admin/app/components/gh-members-segment-select.js b/ghost/admin/app/components/gh-members-segment-select.js index 27daeef372..1532885fe6 100644 --- a/ghost/admin/app/components/gh-members-segment-select.js +++ b/ghost/admin/app/components/gh-members-segment-select.js @@ -73,30 +73,28 @@ export default class GhMembersSegmentSelect extends Component { }); } - if (this.feature.get('multipleProducts')) { - // fetch all tiers w̶i̶t̶h̶ c̶o̶u̶n̶t̶s̶ - // TODO: add `include: 'count.members` to query once API supports - const tiers = yield this.store.query('tier', {filter: 'type:paid', limit: 'all', include: 'monthly_price,yearly_price,benefits'}); + // fetch all tiers w̶i̶t̶h̶ c̶o̶u̶n̶t̶s̶ + // TODO: add `include: 'count.members` to query once API supports + const tiers = yield this.store.query('tier', {filter: 'type:paid', limit: 'all', include: 'monthly_price,yearly_price,benefits'}); - if (tiers.length > 0) { - const tiersGroup = { - groupName: 'Tiers', - options: [] - }; + if (tiers.length > 0) { + const tiersGroup = { + groupName: 'Tiers', + options: [] + }; - tiers.forEach((tier) => { - tiersGroup.options.push({ - name: tier.name, - segment: `tier:${tier.slug}`, - count: tier.count?.members, - class: 'segment-tier' - }); + tiers.forEach((tier) => { + tiersGroup.options.push({ + name: tier.name, + segment: `tier:${tier.slug}`, + count: tier.count?.members, + class: 'segment-tier' }); + }); - options.push(tiersGroup); - if (this.args.selectDefaultTier && !this.args.segment) { - this.args.onChange?.(tiersGroup.options[0].segment); - } + options.push(tiersGroup); + if (this.args.selectDefaultTier && !this.args.segment) { + this.args.onChange?.(tiersGroup.options[0].segment); } } diff --git a/ghost/admin/app/components/gh-portal-links.hbs b/ghost/admin/app/components/gh-portal-links.hbs index d236a18087..8bf1e4ea05 100644 --- a/ghost/admin/app/components/gh-portal-links.hbs +++ b/ghost/admin/app/components/gh-portal-links.hbs @@ -103,7 +103,7 @@ - {{#if (and (feature "multipleProducts") (gt this.tiers.length 1))}} + {{#if (gt this.tiers.length 1)}}
@@ -379,4 +379,4 @@ - \ No newline at end of file + diff --git a/ghost/admin/app/components/gh-post-settings-menu.hbs b/ghost/admin/app/components/gh-post-settings-menu.hbs index ca3fbb10ab..682d83a6df 100644 --- a/ghost/admin/app/components/gh-post-settings-menu.hbs +++ b/ghost/admin/app/components/gh-post-settings-menu.hbs @@ -74,28 +74,21 @@ {{/unless}} {{#if this.showVisibilityInput}} - {{#if (feature "multipleProducts")}} - - - - + + + + - {{#if (eq this.post.visibility "tiers")}} - - - - - {{/if}} - {{else}} -
- - -
+ {{#if (eq this.post.visibility "tiers")}} + + + + {{/if}} {{/if}} diff --git a/ghost/admin/app/components/gh-post-settings-menu/visibility-segment-select.js b/ghost/admin/app/components/gh-post-settings-menu/visibility-segment-select.js index 128b28a5dd..02e1daab4e 100644 --- a/ghost/admin/app/components/gh-post-settings-menu/visibility-segment-select.js +++ b/ghost/admin/app/components/gh-post-settings-menu/visibility-segment-select.js @@ -69,31 +69,29 @@ export default class VisibilitySegmentSelect extends Component { *fetchOptionsTask() { const options = yield []; - if (this.feature.get('multipleProducts')) { - // fetch all tiers with count - // TODO: add `include: 'count.members` to query once API supports - const tiers = yield this.store.query('tier', {filter: 'type:paid', limit: 'all', include: 'monthly_price,yearly_price,benefits'}); - this.tiers = tiers; + // fetch all tiers with count + // TODO: add `include: 'count.members` to query once API supports + const tiers = yield this.store.query('tier', {filter: 'type:paid', limit: 'all', include: 'monthly_price,yearly_price,benefits'}); + this.tiers = tiers; - if (tiers.length > 0) { - const tiersGroup = { - groupName: 'Tiers', - options: [] - }; + if (tiers.length > 0) { + const tiersGroup = { + groupName: 'Tiers', + options: [] + }; - tiers.forEach((tier) => { - tiersGroup.options.push({ - name: tier.name, - id: tier.id, - count: tier.count?.members, - class: 'segment-tier' - }); + tiers.forEach((tier) => { + tiersGroup.options.push({ + name: tier.name, + id: tier.id, + count: tier.count?.members, + class: 'segment-tier' }); + }); - options.push(tiersGroup); - if (this.args.selectDefaultTier && !this.args.tiers) { - this.setSegment([tiersGroup.options[0]]); - } + options.push(tiersGroup); + if (this.args.selectDefaultTier && !this.args.tiers) { + this.setSegment([tiersGroup.options[0]]); } } diff --git a/ghost/admin/app/components/gh-psm-visibility-input.js b/ghost/admin/app/components/gh-psm-visibility-input.js index 67118bfaae..77ddc2fdcd 100644 --- a/ghost/admin/app/components/gh-psm-visibility-input.js +++ b/ghost/admin/app/components/gh-psm-visibility-input.js @@ -12,8 +12,7 @@ const VISIBILITIES = [ @classic export default class GhPsmVisibilityInput extends Component { @service settings; - @service feature; - + // public attrs post = null; @@ -25,11 +24,9 @@ export default class GhPsmVisibilityInput extends Component { init() { super.init(...arguments); this.availableVisibilities = [...VISIBILITIES]; - if (this.feature.get('multipleProducts')) { - this.availableVisibilities.push( - {label: 'Specific tier(s)', name: 'tiers'} - ); - } + this.availableVisibilities.push( + {label: 'Specific tier(s)', name: 'tiers'} + ); } @action diff --git a/ghost/admin/app/components/members/filter.js b/ghost/admin/app/components/members/filter.js index f4ed2bb8d5..0a3254145f 100644 --- a/ghost/admin/app/components/members/filter.js +++ b/ghost/admin/app/components/members/filter.js @@ -18,7 +18,7 @@ const FILTER_PROPERTIES = [ {label: 'Created', name: 'created_at', group: 'Basic', valueType: 'date'}, // Member subscription - {label: 'Membership tier', name: 'tier', group: 'Subscription', valueType: 'array', feature: 'multipleProducts'}, + {label: 'Membership tier', name: 'tier', group: 'Subscription', valueType: 'array'}, {label: 'Member status', name: 'status', group: 'Subscription'}, {label: 'Billing period', name: 'subscriptions.plan_interval', group: 'Subscription'}, {label: 'Stripe subscription status', name: 'subscriptions.status', group: 'Subscription'}, diff --git a/ghost/admin/app/components/modal-enable-tiers.hbs b/ghost/admin/app/components/modal-enable-tiers.hbs deleted file mode 100644 index 83b9dc62b5..0000000000 --- a/ghost/admin/app/components/modal-enable-tiers.hbs +++ /dev/null @@ -1,13 +0,0 @@ -
-

Tiers is a one-way street!

-
-{{svg-jar "close"}} - -
-

Tiers for paid memberships is currently in an early access beta. Once enabled, it cannot be switched off. Learn more here

-
- -
- - -
diff --git a/ghost/admin/app/components/modal-enable-tiers.js b/ghost/admin/app/components/modal-enable-tiers.js deleted file mode 100644 index a6bd479b8d..0000000000 --- a/ghost/admin/app/components/modal-enable-tiers.js +++ /dev/null @@ -1,23 +0,0 @@ -import ModalComponent from 'ghost-admin/components/modal-base'; -import {inject as service} from '@ember/service'; -import {task} from 'ember-concurrency'; - -export default ModalComponent.extend({ - feature: service(), - // Allowed actions - confirm: () => {}, - - actions: { - confirm() { - this.enableTiers.perform(); - } - }, - - enableTiers: task(function* () { - try { - yield this.feature.set('multipleProducts', true); - } finally { - this.send('closeModal'); - } - }).drop() -}); diff --git a/ghost/admin/app/components/modal-portal-settings.hbs b/ghost/admin/app/components/modal-portal-settings.hbs index a15c2afeef..7b221af937 100644 --- a/ghost/admin/app/components/modal-portal-settings.hbs +++ b/ghost/admin/app/components/modal-portal-settings.hbs @@ -44,83 +44,58 @@ {{#if this.membersUtils.isStripeEnabled}}
- {{#if this.showPortalTiers}} -
-

Tiers available at signup

-
+
+

Tiers available at signup

+
+
+ +
+ {{#each this.tiers as |tier|}}
- {{#each this.tiers as |tier|}} -
- -
- {{/each}} - {{/if}} + {{/each}} {{#if this.showPortalPrices}} -
+

Prices available at signup

{{/if}} - {{#unless this.showPortalTiers}} -
- -
- {{/unless}} {{#if this.showPortalPrices}}
diff --git a/ghost/admin/app/components/settings/members-default-post-access.js b/ghost/admin/app/components/settings/members-default-post-access.js index 929d832ca3..589351fd09 100644 --- a/ghost/admin/app/components/settings/members-default-post-access.js +++ b/ghost/admin/app/components/settings/members-default-post-access.js @@ -9,7 +9,7 @@ export default class SettingsMembersDefaultPostAccess extends Component { @tracked showSegmentError; get options() { - const defaultOptions = [{ + return [{ name: 'Public', description: 'All site visitors to your site, no login required', value: 'public', @@ -27,21 +27,17 @@ export default class SettingsMembersDefaultPostAccess extends Component { value: 'paid', icon: 'members-paid', icon_color: 'pink' + }, { + name: 'Specific tier(s)', + description: 'Members with any of the selected tiers', + value: 'tiers', + icon: 'members-segment', + icon_color: 'yellow' }]; - if (this.feature.get('multipleProducts')) { - defaultOptions.push({ - name: 'Specific tier(s)', - description: 'Members with any of the selected tiers', - value: 'tiers', - icon: 'members-segment', - icon_color: 'yellow' - }); - } - return defaultOptions; } get hasVisibilityFilter() { - return this.feature.get('multipleProducts') && !['public', 'members', 'paid'].includes(this.settings.get('defaultContentVisibility')); + return !['public', 'members', 'paid'].includes(this.settings.get('defaultContentVisibility')); } get visibilityTiers() { diff --git a/ghost/admin/app/components/tiers/segment-select.js b/ghost/admin/app/components/tiers/segment-select.js index 5d9d9be69c..afa050b18e 100644 --- a/ghost/admin/app/components/tiers/segment-select.js +++ b/ghost/admin/app/components/tiers/segment-select.js @@ -69,31 +69,29 @@ export default class TiersSegmentSelect extends Component { *fetchOptionsTask() { const options = yield []; - if (this.feature.get('multipleProducts')) { - // fetch all tiers with count - // TODO: add `include: 'count.members` to query once API supports - const tiers = yield this.store.query('tier', {filter: 'type:paid', limit: 'all', include: 'monthly_price,yearly_price,benefits'}); - this.tiers = tiers; + // fetch all tiers with count + // TODO: add `include: 'count.members` to query once API supports + const tiers = yield this.store.query('tier', {filter: 'type:paid', limit: 'all', include: 'monthly_price,yearly_price,benefits'}); + this.tiers = tiers; - if (tiers.length > 0) { - const tiersGroup = { - groupName: 'Tiers', - options: [] - }; + if (tiers.length > 0) { + const tiersGroup = { + groupName: 'Tiers', + options: [] + }; - tiers.forEach((tier) => { - tiersGroup.options.push({ - name: tier.name, - id: tier.id, - count: tier.count?.members, - class: 'segment-tier' - }); + tiers.forEach((tier) => { + tiersGroup.options.push({ + name: tier.name, + id: tier.id, + count: tier.count?.members, + class: 'segment-tier' }); + }); - options.push(tiersGroup); - if (this.args.selectDefaultTier && !this.args.tiers) { - this.setSegment([tiersGroup.options[0]]); - } + options.push(tiersGroup); + if (this.args.selectDefaultTier && !this.args.tiers) { + this.setSegment([tiersGroup.options[0]]); } } diff --git a/ghost/admin/app/controllers/offer.js b/ghost/admin/app/controllers/offer.js index bfd1e9ecf3..5b354902c2 100644 --- a/ghost/admin/app/controllers/offer.js +++ b/ghost/admin/app/controllers/offer.js @@ -111,13 +111,8 @@ export default class OffersController extends Controller { let yearlyLabel; const tierCurrency = tier.monthlyPrice.currency; const tierCurrencySymbol = tierCurrency.toUpperCase(); - if (this.feature.get('multipleProducts')) { - monthlyLabel = `${tier.name} - Monthly (${ghPriceAmount(tier.monthlyPrice.amount)} ${tierCurrencySymbol})`; - yearlyLabel = `${tier.name} - Yearly (${ghPriceAmount(tier.yearlyPrice.amount)} ${tierCurrencySymbol})`; - } else { - monthlyLabel = `Monthly (${ghPriceAmount(tier.monthlyPrice.amount)} ${tierCurrencySymbol})`; - yearlyLabel = `Yearly (${ghPriceAmount(tier.yearlyPrice.amount)} ${tierCurrencySymbol})`; - } + monthlyLabel = `${tier.name} - Monthly (${ghPriceAmount(tier.monthlyPrice.amount)} ${tierCurrencySymbol})`; + yearlyLabel = `${tier.name} - Yearly (${ghPriceAmount(tier.yearlyPrice.amount)} ${tierCurrencySymbol})`; cadences.push({ label: monthlyLabel, diff --git a/ghost/admin/app/controllers/settings/labs.js b/ghost/admin/app/controllers/settings/labs.js index a2d7a82966..d3c2db7212 100644 --- a/ghost/admin/app/controllers/settings/labs.js +++ b/ghost/admin/app/controllers/settings/labs.js @@ -50,7 +50,6 @@ export default class LabsController extends Controller { importSuccessful = false; showDeleteAllModal = false; showEarlyAccessModal = false; - showEnableTiersModal = false; submitting = false; uploadButtonText = 'Import'; importMimeType = null; @@ -159,11 +158,6 @@ export default class LabsController extends Controller { this.toggleProperty('showEarlyAccessModal'); } - @action - toggleEnableTiersModal() { - this.toggleProperty('showEnableTiersModal'); - } - @action async toggleIsOAuthEnabled() { if (this.isOAuthEnabled) { diff --git a/ghost/admin/app/controllers/settings/membership.js b/ghost/admin/app/controllers/settings/membership.js index aeac15221f..272883128e 100644 --- a/ghost/admin/app/controllers/settings/membership.js +++ b/ghost/admin/app/controllers/settings/membership.js @@ -361,36 +361,17 @@ export default class MembersAccessController extends Controller { @task({drop: true}) *saveSettingsTask(options) { - if (!this.feature.get('multipleProducts')) { - yield this.validateStripePlans({updatePortalPreview: false}); - - if (this.stripePlanError) { - return; - } - - if (this.settings.get('errors').length !== 0) { - return; - } - - yield this.saveTier(); - const result = yield this.settings.save(); - - this.updatePortalPreview(options); - - return result; - } else { - if (this.settings.get('errors').length !== 0) { - return; - } - // When no filer is selected in `Specific tier(s)` option - if (!this.settings.get('defaultContentVisibility')) { - return; - } - const result = yield this.settings.save(); - yield this.freeTier.save(); - this.updatePortalPreview(options); - return result; + if (this.settings.get('errors').length !== 0) { + return; } + // When no filer is selected in `Specific tier(s)` option + if (!this.settings.get('defaultContentVisibility')) { + return; + } + const result = yield this.settings.save(); + yield this.freeTier.save(); + this.updatePortalPreview(options); + return result; } async saveTier() { diff --git a/ghost/admin/app/services/feature.js b/ghost/admin/app/services/feature.js index 38ebe55760..9d303c021b 100644 --- a/ghost/admin/app/services/feature.js +++ b/ghost/admin/app/services/feature.js @@ -56,7 +56,6 @@ export default class FeatureService extends Service { nightShift; // labs flags - @feature('multipleProducts') multipleProducts; @feature('dashboardV5') dashboardV5; @feature('oauthLogin') oauthLogin; @feature('membersActivity') membersActivity; @@ -66,8 +65,6 @@ export default class FeatureService extends Service { @feature('multipleNewslettersUI') multipleNewslettersUI; @feature('tweetGridCard') tweetGridCard; @feature('improvedOnboarding') improvedOnboarding; - @feature('tierWelcomePages') tierWelcomePages; - @feature('tierName') tierName; @feature('membersTableStatus') membersTableStatus; @feature('selectablePortalLinks') selectablePortalLinks; @feature('publishingFlow') publishingFlow; diff --git a/ghost/admin/app/services/members-utils.js b/ghost/admin/app/services/members-utils.js index df903d3ee4..25e0a7ab6c 100644 --- a/ghost/admin/app/services/members-utils.js +++ b/ghost/admin/app/services/members-utils.js @@ -121,7 +121,7 @@ export default class MembersUtilsService extends Service { settingsParam.append('portalPrices', encodeURIComponent(portalPlans)); } - if (portalTiers && this.feature.get('multipleProducts')) { + if (portalTiers) { settingsParam.append('portalProducts', encodeURIComponent(portalTiers)); } diff --git a/ghost/admin/app/templates/offer.hbs b/ghost/admin/app/templates/offer.hbs index 2bdd65d211..fe91c34acd 100644 --- a/ghost/admin/app/templates/offer.hbs +++ b/ghost/admin/app/templates/offer.hbs @@ -46,11 +46,7 @@
- {{#if (feature "multipleProducts")}} - {{else}} - - {{/if}} {{offer.name}} - {{#if (feature "multipleProducts")}} - {{offer.tier.name}} - - - {{/if}} + {{offer.tier.name}} + - {{if (eq offer.cadence 'month') 'Monthly' 'Yearly'}} diff --git a/ghost/admin/app/templates/settings/labs.hbs b/ghost/admin/app/templates/settings/labs.hbs index 55b212699e..6d4935c77b 100644 --- a/ghost/admin/app/templates/settings/labs.hbs +++ b/ghost/admin/app/templates/settings/labs.hbs @@ -359,9 +359,3 @@ @close={{action "toggleDeleteAllModal"}} @modifier="action wide" /> {{/if}} - -{{#if this.showEnableTiersModal}} - -{{/if}} diff --git a/ghost/admin/app/templates/settings/membership.hbs b/ghost/admin/app/templates/settings/membership.hbs index c5008bb2f8..43d58b4f99 100644 --- a/ghost/admin/app/templates/settings/membership.hbs +++ b/ghost/admin/app/templates/settings/membership.hbs @@ -48,7 +48,7 @@
-
+
{{#if (or (eq this.settings.membersSignupAccess 'none') this.switchFromNoneTask.isRunning)}}
{{svg-jar "portal-logo-stroke"}} @@ -91,46 +91,24 @@
{{#liquid-if this.freeOpen}}
- {{#if (feature "multipleProducts")}} - + + + - {{/if}} - {{#if (or (not (feature "tierWelcomePages")) (not (feature "multipleProducts")))}} - - - - -

Redirect to this URL after signup for a free membership

- - {{else}} - - - -

Redirect to this URL after signup for a free membership

- - {{/if}} +

Redirect to this URL after signup for a free membership

+
{{/liquid-if}}
@@ -167,82 +145,11 @@ {{#if this.fetchDefaultTier.isRunning}} Loading... {{else}} - {{#if (feature "multipleProducts")}} - - {{else}} - -
- - – -
- -
- {{this.currency}} - {{svg-jar "arrow-down-small"}} -
- - -
-
-
- -
- - {{this.currency}}/month -
-
- - {{this.currency}}/year -
-
- {{#if this.stripePlanError}} -

{{this.stripePlanError}}

- {{/if}} - - {{/if}} - {{#if (or (not (feature "tierWelcomePages")) (not (feature "multipleProducts")))}} - - - - -

Redirect to this URL after signup for premium membership

- - {{/if}} + {{/if}}
{{/liquid-if}} diff --git a/ghost/admin/mirage/fixtures/settings.js b/ghost/admin/mirage/fixtures/settings.js index 89aff6a3ab..8fe96faec6 100644 --- a/ghost/admin/mirage/fixtures/settings.js +++ b/ghost/admin/mirage/fixtures/settings.js @@ -73,7 +73,11 @@ export default [ { id: 12, key: 'labs', - value: '{}', + value: JSON.stringify({ + // Keep the GA flags that are not yet cleaned up in frontend code here + multipleNewsletters: true, + multipleNewslettersUI: true + }), group: 'labs', created_at: '2015-01-12T18:29:01.000Z', created_by: 1, diff --git a/ghost/admin/tests/acceptance/editor-test.js b/ghost/admin/tests/acceptance/editor-test.js index 8424b56c71..ccb90bd9da 100644 --- a/ghost/admin/tests/acceptance/editor-test.js +++ b/ghost/admin/tests/acceptance/editor-test.js @@ -6,7 +6,6 @@ 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 {enableLabsFlag} from '../helpers/labs-flag'; import {enableMailgun} from '../helpers/mailgun'; import {enableNewsletters} from '../helpers/newsletters'; import {enableStripe} from '../helpers/stripe'; @@ -845,7 +844,6 @@ describe('Acceptance: Editor', function () { const role = this.server.create('role', {name: 'Administrator'}); user = this.server.create('user', {roles: [role]}); this.server.loadFixtures('settings'); - enableLabsFlag(this.server, 'multipleNewsletters'); return await authenticateSession(); }); diff --git a/ghost/admin/tests/acceptance/members/details-test.js b/ghost/admin/tests/acceptance/members/details-test.js index 0695ec12a8..b004fbf7d3 100644 --- a/ghost/admin/tests/acceptance/members/details-test.js +++ b/ghost/admin/tests/acceptance/members/details-test.js @@ -20,7 +20,6 @@ describe('Acceptance: Member details', function () { this.server.loadFixtures('settings'); enableLabsFlag(this.server, 'membersLastSeenFilter'); enableLabsFlag(this.server, 'membersTimeFilters'); - enableLabsFlag(this.server, 'multipleProducts'); enableStripe(this.server); enableNewsletters(this.server, true); diff --git a/ghost/admin/tests/acceptance/members/filter-test.js b/ghost/admin/tests/acceptance/members/filter-test.js index cb40c49ad8..689a7fb3a6 100644 --- a/ghost/admin/tests/acceptance/members/filter-test.js +++ b/ghost/admin/tests/acceptance/members/filter-test.js @@ -3,7 +3,6 @@ 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'; @@ -21,7 +20,6 @@ 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); diff --git a/ghost/admin/tests/acceptance/settings/membership-test.js b/ghost/admin/tests/acceptance/settings/membership-test.js index 7efd52e3f3..e3c14f71cf 100644 --- a/ghost/admin/tests/acceptance/settings/membership-test.js +++ b/ghost/admin/tests/acceptance/settings/membership-test.js @@ -1,6 +1,5 @@ import {authenticateSession, invalidateSession} from 'ember-simple-auth/test-support'; import {blur, click, currentURL, fillIn, find, findAll} from '@ember/test-helpers'; -import {enableLabsFlag} from '../../helpers/labs-flag'; import {expect} from 'chai'; import {setupApplicationTest} from 'ember-mocha'; import {setupMirage} from 'ember-cli-mirage/test-support'; @@ -11,9 +10,6 @@ describe('Acceptance: Settings - Membership', function () { setupMirage(hooks); beforeEach(function () { - enableLabsFlag(this.server, 'multipleProducts'); - enableLabsFlag(this.server, 'tierWelcomePages'); - enableLabsFlag(this.server, 'tierName'); }); beforeEach(async function () { diff --git a/ghost/admin/tests/acceptance/settings/newsletters-test.js b/ghost/admin/tests/acceptance/settings/newsletters-test.js index 2fbd4a946b..bf854b6527 100644 --- a/ghost/admin/tests/acceptance/settings/newsletters-test.js +++ b/ghost/admin/tests/acceptance/settings/newsletters-test.js @@ -1,12 +1,11 @@ import {authenticateSession} from 'ember-simple-auth/test-support'; import {click, currentURL, fillIn, find, findAll} from '@ember/test-helpers'; -import {enableLabsFlag} from '../../helpers/labs-flag'; import {expect} from 'chai'; import {setupApplicationTest} from 'ember-mocha'; import {setupMirage} from 'ember-cli-mirage/test-support'; import {visit} from '../../helpers/visit'; -describe('Acceptance: Settings - Newsletters (multipleNewslettersUI)', function () { +describe('Acceptance: Settings - Newsletters', function () { const hooks = setupApplicationTest(); setupMirage(hooks); @@ -16,9 +15,6 @@ describe('Acceptance: Settings - Newsletters (multipleNewslettersUI)', function const role = this.server.create('role', {name: 'Owner'}); this.server.create('user', {roles: [role]}); - enableLabsFlag(this.server, 'multipleNewsletters'); - enableLabsFlag(this.server, 'multipleNewslettersUI'); - return await authenticateSession(); }); diff --git a/ghost/admin/tests/integration/components/gh-psm-visibility-input-test.js b/ghost/admin/tests/integration/components/gh-psm-visibility-input-test.js index 7e20299b3d..9a6328a5f1 100644 --- a/ghost/admin/tests/integration/components/gh-psm-visibility-input-test.js +++ b/ghost/admin/tests/integration/components/gh-psm-visibility-input-test.js @@ -16,7 +16,7 @@ describe('Integration: Component: gh-psm-visibility-input', function () { await render(hbs`{{gh-psm-visibility-input post=post}}`); expect(this.element, 'top-level elements').to.exist; - expect(findAll('option'), 'number of options').to.have.length(3); + expect(findAll('option'), 'number of options').to.have.length(4); expect(find('select').value, 'selected option value').to.equal('members'); }); @@ -31,7 +31,7 @@ describe('Integration: Component: gh-psm-visibility-input', function () { await render(hbs`{{gh-psm-visibility-input post=post}}`); expect(this.element, 'top-level elements').to.exist; - expect(findAll('option'), 'number of options').to.have.length(3); + expect(findAll('option'), 'number of options').to.have.length(4); expect(find('select').value, 'selected option value').to.equal('public'); await fillIn('select', 'paid');