diff --git a/ghost/admin/.lint-todo b/ghost/admin/.lint-todo index bd2304536f..ddf9ec7544 100644 --- a/ghost/admin/.lint-todo +++ b/ghost/admin/.lint-todo @@ -1831,3 +1831,8 @@ remove|ember-template-lint|no-action|7|12|7|12|fada170dae44678cba8240b4ae3233c63 remove|ember-template-lint|no-action|17|12|17|12|b75d66d02a33b108a64bb94d494fa194434c82f9|1644364800000|1646956800000|1649545200000|lib/koenig-editor/addon/components/koenig-toolbar.hbs remove|ember-template-lint|no-action|28|16|28|16|e5e787868d089ae3141666004a914deff774b489|1644364800000|1646956800000|1649545200000|lib/koenig-editor/addon/components/koenig-toolbar.hbs remove|ember-template-lint|no-action|70|12|70|12|03d2eaf613eae8cb3ea3c821ba63544c730364c8|1644364800000|1646956800000|1649545200000|lib/koenig-editor/addon/components/koenig-toolbar.hbs +remove|ember-template-lint|no-duplicate-landmark-elements|126|24|126|24|a19c12d5f0d5fa9b890943214b862502d9f2dcee|1643760000000|1646352000000|1648940400000|app/components/modal-product.hbs +remove|ember-template-lint|no-nested-landmark|126|24|126|24|a19c12d5f0d5fa9b890943214b862502d9f2dcee|1643760000000|1646352000000|1648940400000|app/components/modal-product.hbs +remove|ember-template-lint|no-duplicate-attributes|9|4|9|4|6b5f76f812df2b84f2ed9ee5a557ca1bf98710df|1643760000000|1646352000000|1648940400000|app/components/gh-post-settings-menu/visibility-segment-select.hbs +add|ember-template-lint|no-duplicate-landmark-elements|131|24|131|24|9eb7d301f1f50334e793aafab8f6b9e8905125ab|1645142400000|1647734400000|1650322800000|app/components/modal-product.hbs +add|ember-template-lint|no-nested-landmark|131|24|131|24|9eb7d301f1f50334e793aafab8f6b9e8905125ab|1645142400000|1647734400000|1650322800000|app/components/modal-product.hbs diff --git a/ghost/admin/app/components/gh-benefit-item.hbs b/ghost/admin/app/components/gh-benefit-item.hbs index 96262e5bb5..64b6300c16 100644 --- a/ghost/admin/app/components/gh-benefit-item.hbs +++ b/ghost/admin/app/components/gh-benefit-item.hbs @@ -21,19 +21,22 @@ @input={{action "updateLabel" value="target.value"}} @keyPress={{action "clearLabelErrors"}} @stopEnterKeyDownPropagation={{true}} - @focus-out={{action "updateLabel" this.name}} data-test-input="name" /> + @focus-out={{action "updateLabel" this.name}} + data-test-input="benefit-label" /> + + @property="name" + data-test-error="benefit-label" /> {{#if this.benefitItem.isNew}} - {{else}} - {{/if}} diff --git a/ghost/admin/app/components/gh-post-settings-menu/visibility-segment-select.hbs b/ghost/admin/app/components/gh-post-settings-menu/visibility-segment-select.hbs index fa69faa1ae..1f238b14f3 100644 --- a/ghost/admin/app/components/gh-post-settings-menu/visibility-segment-select.hbs +++ b/ghost/admin/app/components/gh-post-settings-menu/visibility-segment-select.hbs @@ -6,12 +6,11 @@ @allowCreation={{false}} @renderInPlace={{this.renderInPlace}} @onChange={{this.setSegment}} - @disabled={{@disabled}} @class="select-members" @placeholder="Select a tier" as |option| > - {{option.name}} + {{option.name}} +
-

- {{this.product.name}} +

+ {{@product.name}}

-

- {{#if this.product.description.length}} - {{this.product.description}} +

+ {{#if @product.description.length}} + {{@product.description}} {{else}} No description added for this tier. {{/if}}

-
-

Benefits ({{if this.product.benefits.length this.product.benefits.length "0"}})

- {{#if this.product.benefits.length}} +
+

Benefits ({{or @product.benefits.length "0"}})

+ {{#if @product.benefits.length}}
    - {{#each this.product.benefits as |benefit|}} + {{#each @product.benefits as |benefit|}}
  • {{svg-jar "check"}} {{benefit.name}}
    • {{/each}}
@@ -23,10 +23,10 @@

No benefits added for this tier.

{{/if}}
- {{#if (eq this.product.type "free" )}} + {{#if (eq @product.type "free" )}}
-
+
{{currency-symbol this.productCurrency}} 0 @@ -35,31 +35,31 @@
{{/if}} - {{#if (eq this.product.type "paid" )}} + {{#if (eq @product.type "paid" )}}
-
+
{{currency-symbol this.productCurrency}} - {{gh-price-amount this.product.monthlyPrice.amount}} + {{gh-price-amount @product.monthlyPrice.amount}}
Monthly
-
+
{{currency-symbol this.productCurrency}} - {{gh-price-amount this.product.yearlyPrice.amount}} + {{gh-price-amount @product.yearlyPrice.amount}}
Yearly
{{/if}} - {{#if (eq this.product.type "paid" )}} + {{#if (eq @product.type "paid" )}}
  • -
    • {{#if this.showArchiveOption}}
    • @@ -92,7 +92,7 @@
    {{else}}
    - -
    -
    +
    +

    {{this.title}}

    @@ -14,7 +14,7 @@

    Basic

    {{#unless this.isFreeProduct}} - + + @class="gh-input" + data-test-input="product-name" /> {{/unless}} - + + {{#if this.isFreeProduct}} + @class="gh-input" + data-test-input="free-product-description" /> {{else}} + @class="gh-input" + data-test-input="product-description" /> {{/if}} + {{#unless this.isFreeProduct}} - +
    – @@ -138,7 +143,7 @@ @focusItem={{action "focusItem"}} @deleteItem={{action "deleteBenefit"}} @updateLabel={{action "updateLabel"}} - data-test-navitem={{index}} /> + data-test-benefit-item={{index}} /> {{/each}} @@ -148,45 +153,45 @@ @addItem={{action "addBenefit"}} @deleteItem={{action "deleteBenefit"}} @updateLabel={{action "updateLabel"}} - data-test-navitem="new" /> + data-test-benefit-item="new" />
    -
    +
    {{#if this.isFreeProduct}} -

    Free Membership Preview

    +

    Free Membership Preview

    {{else}} -

    Tier Preview

    +

    Tier Preview

    {{/if}}
    {{#if this.product.name}} -

    {{this.product.name}}

    +

    {{this.product.name}}

    {{else}} -

    Bronze

    +

    Bronze

    {{/if}} {{#if this.product.description}} -

    {{this.product.description}}

    +

    {{this.product.description}}

    {{else}} {{#if this.isFreeProduct}} -

    Free preview of {{this.settings.title}}

    +

    Free preview of {{this.settings.title}}

    {{else}} -

    Full access to premium content

    +

    Full access to premium content

    {{/if}} {{/if}} {{#if this.benefits}} -
      +
        {{#each this.benefits as |benefitItem index|}}
      • {{svg-jar "check-2"}} {{benefitItem.name}}
        • {{/each}}
      {{else}} -
        +
          {{#if this.isFreeProduct}}
        • {{svg-jar "check-2"}} Access to all public posts
          • {{else}} @@ -194,12 +199,12 @@ {{/if}}
        {{/if}} -
        +
        {{#if this.isFreeProduct}} - - {{currency-symbol this.currency}} - 0 - + + {{currency-symbol this.currency}} + 0 + {{else}} {{#if this.stripeMonthlyAmount}} diff --git a/ghost/admin/app/components/settings/members-default-post-access.hbs b/ghost/admin/app/components/settings/members-default-post-access.hbs index 7ee1fdfa5a..b522d3c506 100644 --- a/ghost/admin/app/components/settings/members-default-post-access.hbs +++ b/ghost/admin/app/components/settings/members-default-post-access.hbs @@ -1,4 +1,4 @@ -
        +

        Default post access

        @@ -15,7 +15,7 @@ @dropdownClass="gh-setting-dropdown-list" as |option| > -
        +
        {{svg-jar option.icon class=(concat "w8 h8 mr2 fill-" (or option.icon_color "green"))}}
        {{option.name}}
        @@ -24,7 +24,7 @@
        {{#if this.hasVisibilityFilter}} -
        +
        { + return (visibilityTiersData || []).map((id) => { return {id}; }); } diff --git a/ghost/admin/app/components/settings/members-subscription-access.hbs b/ghost/admin/app/components/settings/members-subscription-access.hbs index 33727e4733..4091eaf787 100644 --- a/ghost/admin/app/components/settings/members-subscription-access.hbs +++ b/ghost/admin/app/components/settings/members-subscription-access.hbs @@ -1,4 +1,4 @@ -
        +

        Subscription access

        @@ -14,7 +14,7 @@ @dropdownClass="gh-setting-dropdown-list" as |option| > -
        +
        {{svg-jar option.icon class=(concat "w8 h8 mr2 fill-" (or option.icon_color "green"))}}
        {{option.name}}
        diff --git a/ghost/admin/app/templates/settings/membership.hbs b/ghost/admin/app/templates/settings/membership.hbs index a430e0d1d2..58643ce76f 100644 --- a/ghost/admin/app/templates/settings/membership.hbs +++ b/ghost/admin/app/templates/settings/membership.hbs @@ -50,7 +50,7 @@
        {{#if (or (eq this.settings.membersSignupAccess 'none') this.switchFromNoneTask.isRunning)}} -
        +
        {{svg-jar "portal-logo-stroke"}}

        Portal disabled

        Change your Subscription Access setting to re-enable Portal

        @@ -61,7 +61,8 @@ @src={{this.portalPreviewUrl}} @invisibleUntilLoaded="portal-ready" @onInserted={{this.portalPreviewInserted}} - @onDestroyed={{this.portalPreviewDestroyed}} /> + @onDestroyed={{this.portalPreviewDestroyed}} + data-test-iframe="portal-preview"/> {{/if}}
        @@ -85,11 +86,11 @@

        Free

        Free member sign up settings

        - +
        {{#liquid-if this.freeOpen}} -
        +
        {{#if (feature "multipleProducts")}}

        Redirect to this URL after signup for a free membership

        diff --git a/ghost/admin/mirage/config/products.js b/ghost/admin/mirage/config/products.js index 6fc30e16c9..ac0f7ea23c 100644 --- a/ghost/admin/mirage/config/products.js +++ b/ghost/admin/mirage/config/products.js @@ -21,7 +21,28 @@ export default function mockProducts(server) { }); }); - server.put('/products/:id/'); + server.put('/products/:id/', function ({products, productBenefits}, {params}) { + const attrs = this.normalizedRequestAttrs(); + const product = products.find(params.id); + + const benefitAttrs = attrs.benefits; + delete attrs.benefits; + + product.update(attrs); + + benefitAttrs.forEach((benefit) => { + if (benefit.id) { + const productBenefit = productBenefits.find(benefit.id); + productBenefit.product = product; + productBenefit.save(); + } else { + product.createProductBenefit(benefit); + product.save(); + } + }); + + return product.save(); + }); server.del('/products/:id/'); } diff --git a/ghost/admin/mirage/factories/product.js b/ghost/admin/mirage/factories/product.js new file mode 100644 index 0000000000..3e4fb27403 --- /dev/null +++ b/ghost/admin/mirage/factories/product.js @@ -0,0 +1,25 @@ +import {Factory} from 'ember-cli-mirage'; + +export default Factory.extend({ + name(i) { return `Product ${i}`; }, + description(i) { return `Description for product ${i}`; }, + active: true, + slug(i) { return `product-${i}`;}, + type: 'paid', + monthly_price() { + return { + interval: 'month', + nickname: 'Monthly', + currency: 'usd', + amount: 500 + }; + }, + yearly_price() { + return { + interval: 'year', + nickname: 'Yearly', + currency: 'usd', + amount: 5000 + }; + } +}); diff --git a/ghost/admin/mirage/fixtures/products.js b/ghost/admin/mirage/fixtures/products.js index aa38c7f0f1..dc38463bef 100644 --- a/ghost/admin/mirage/fixtures/products.js +++ b/ghost/admin/mirage/fixtures/products.js @@ -1,24 +1,31 @@ /* eslint-disable camelcase */ export default [ { - id: 1, - name: 'Test Product', - slug: 'test-product', - monthly_price: { - interval: 'month', - nickname: 'Monthly', - currency: 'usd', - amount: 500 - }, - yearly_price: { - interval: 'year', - nickname: 'Yearly', - currency: 'usd', - amount: 5000 - }, - created_at: '2015-11-13T16:01:29.131Z', - created_by: 1, - updated_at: '2015-11-13T16:01:29.131Z', - updated_by: 1 + id: '1', + active: true, + benefits: [], + createdAt: '2022-02-04T13:11:40.000Z', + description: null, + monthlyPrice: null, + name: 'Free', + slug: 'free', + type: 'free', + updatedAt: '2022-02-04T13:34:53.000Z', + welcomePageUrl: null, + yearlyPrice: null + }, + { + id: '2', + active: true, + benefits: [], + createdAt: '2022-02-04T13:11:40.000Z', + description: null, + monthlyPrice: null, + name: 'Default Product', + slug: 'default-product', + type: 'paid', + updatedAt: '2022-02-04T13:11:40.000Z', + welcomePageUrl: null, + yearlyPrice: null } ]; diff --git a/ghost/admin/mirage/fixtures/settings.js b/ghost/admin/mirage/fixtures/settings.js index bd1bb2de5b..139c0606ce 100644 --- a/ghost/admin/mirage/fixtures/settings.js +++ b/ghost/admin/mirage/fixtures/settings.js @@ -222,5 +222,35 @@ export default [ updated_at: '2021-11-01T15:44:43.494Z', updated_by: 1, value: 'casper' + }, + { + id: 28, + created_at: '2022-02-16T09:38:00.000Z', + created_by: 1, + key: 'members_signup_access', + group: 'members', + updated_at: '2022-02-16T09:38:00.000Z', + updated_by: 1, + value: 'all' + }, + { + id: 29, + created_at: '2022-02-16T09:38:00.000Z', + created_by: 1, + key: 'default_content_visibility', + group: 'members', + updated_at: '2022-02-16T09:38:00.000Z', + updated_by: 1, + value: 'public' + }, + { + id: 30, + created_at: '2022-02-16T09:38:00.000Z', + created_by: 1, + key: 'default_content_visibility_tiers', + group: 'members', + updated_at: '2022-02-16T09:38:00.000Z', + updated_by: 1, + value: '[]' } ]; diff --git a/ghost/admin/mirage/models/product-benefit.js b/ghost/admin/mirage/models/product-benefit.js new file mode 100644 index 0000000000..1ae3dfdd2a --- /dev/null +++ b/ghost/admin/mirage/models/product-benefit.js @@ -0,0 +1,5 @@ +import {Model, belongsTo} from 'ember-cli-mirage'; + +export default Model.extend({ + product: belongsTo('product') +}); diff --git a/ghost/admin/mirage/models/product.js b/ghost/admin/mirage/models/product.js index 6bfe517e93..e773e83f9e 100644 --- a/ghost/admin/mirage/models/product.js +++ b/ghost/admin/mirage/models/product.js @@ -1,4 +1,7 @@ -import {Model} from 'ember-cli-mirage'; +import {Model, hasMany} from 'ember-cli-mirage'; export default Model.extend({ + // ran into odd relationship bugs when called `benefits` + // serializer will rename to `benefits` + productBenefits: hasMany() }); diff --git a/ghost/admin/mirage/serializers/product-benefit.js b/ghost/admin/mirage/serializers/product-benefit.js new file mode 100644 index 0000000000..0692d2800b --- /dev/null +++ b/ghost/admin/mirage/serializers/product-benefit.js @@ -0,0 +1,3 @@ +import BaseSerializer from './application'; + +export default BaseSerializer.extend({}); diff --git a/ghost/admin/mirage/serializers/product.js b/ghost/admin/mirage/serializers/product.js new file mode 100644 index 0000000000..3f4c659d62 --- /dev/null +++ b/ghost/admin/mirage/serializers/product.js @@ -0,0 +1,22 @@ +import BaseSerializer from './application'; +import {underscore} from '@ember/string'; + +export default BaseSerializer.extend({ + embed: true, + + include(/*request*/) { + let includes = []; + + includes.push('productBenefits'); + + return includes; + }, + + keyForEmbeddedRelationship(relationshipName) { + if (relationshipName === 'productBenefits') { + return 'benefits'; + } + + return underscore(relationshipName); + } +}); diff --git a/ghost/admin/tests/acceptance/offers-test.js b/ghost/admin/tests/acceptance/offers-test.js index bf8359e8b8..f5bdac3f75 100644 --- a/ghost/admin/tests/acceptance/offers-test.js +++ b/ghost/admin/tests/acceptance/offers-test.js @@ -42,8 +42,9 @@ describe('Acceptance: Offers', function () { }); it('it renders, can be navigated, can edit offer', async function () { - let offer1 = this.server.create('offer', {createdAt: moment.utc().subtract(1, 'day').valueOf()}); - this.server.create('offer', {createdAt: moment.utc().subtract(2, 'day').valueOf()}); + const product = this.server.create('product'); + let offer1 = this.server.create('offer', {tier: {id: product.id}, createdAt: moment.utc().subtract(1, 'day').valueOf()}); + this.server.create('offer', {tier: {id: product.id}, createdAt: moment.utc().subtract(2, 'day').valueOf()}); await visit('/offers'); diff --git a/ghost/admin/tests/acceptance/settings/membership-test.js b/ghost/admin/tests/acceptance/settings/membership-test.js new file mode 100644 index 0000000000..80b7f856fc --- /dev/null +++ b/ghost/admin/tests/acceptance/settings/membership-test.js @@ -0,0 +1,283 @@ +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'; +import {visit} from '../../helpers/visit'; + +describe('Acceptance: Settings - Membership', function () { + const hooks = setupApplicationTest(); + setupMirage(hooks); + + beforeEach(function () { + enableLabsFlag(this.server, 'multipleProducts'); + enableLabsFlag(this.server, 'tierWelcomePages'); + enableLabsFlag(this.server, 'tierName'); + }); + + beforeEach(async function () { + this.server.loadFixtures('configs'); + this.server.loadFixtures('products'); + + const role = this.server.create('role', {name: 'Owner'}); + this.server.create('user', {roles: [role]}); + + return await authenticateSession(); + }); + + describe('permissions', function () { + let visitAs; + + before(function () { + visitAs = async (roleName) => { + const role = this.server.create('role', {name: roleName}); + this.server.create('user', {roles: [role]}); + await authenticateSession(); + await visit('/settings/members'); + }; + }); + + beforeEach(async function () { + this.server.db.users.remove(); + await invalidateSession(); + }); + + it('allows Owners', async function () { + await visitAs('Owner'); + expect(currentURL()).to.equal('/settings/members'); + }); + + it('allows Administrators', async function () { + await visitAs('Administrator'); + expect(currentURL()).to.equal('/settings/members'); + }); + + it('disallows Editors', async function () { + await visitAs('Editor'); + expect(currentURL()).to.not.equal('/settings/members'); + }); + + it('disallows Authors', async function () { + await visitAs('Author'); + expect(currentURL()).to.not.equal('/settings/members'); + }); + + it('disallows Contributors', async function () { + await visitAs('Contributor'); + expect(currentURL()).to.not.equal('/settings/members'); + }); + }); + + it('can change subscription access', async function () { + await visit('/settings/members'); + + expect(this.server.db.settings.findBy({key: 'members_signup_access'}).value).to.equal('all'); + expect(find('[data-test-members-subscription-option="all"]'), 'initial selection is "all"').to.exist; + expect(find('[data-test-iframe="portal-preview"]'), 'initial preview src matches "all"') + .to.have.attribute('src').match(/membersSignupAccess=all/); + + // open dropdown + await click('[data-test-members-subscription-option="all"]'); + + // all settings exist in dropdown + expect(find('.ember-power-select-options [data-test-members-subscription-option="all"]'), 'all option').to.exist; + expect(find('.ember-power-select-options [data-test-members-subscription-option="invite"]'), 'invite option').to.exist; + expect(find('.ember-power-select-options [data-test-members-subscription-option="none"]'), 'none option').to.exist; + + // switch to invite + await click('.ember-power-select-options [data-test-members-subscription-option="invite"]'); + + expect(find('.ember-power-select-options'), 'dropdown closes').to.not.exist; + expect(find('[data-test-members-subscription-option="invite"]'), 'invite option shown after selected').to.exist; + expect(find('[data-test-iframe="portal-preview"]')) + .to.have.attribute('src').match(/membersSignupAccess=invite/); + + await click('[data-test-button="save-settings"]'); + + expect(this.server.db.settings.findBy({key: 'members_signup_access'}).value).to.equal('invite'); + + // switch to nobody + await click('[data-test-members-subscription-option="invite"]'); + await click('.ember-power-select-options [data-test-members-subscription-option="none"]'); + + expect(find('.ember-power-select-options'), 'dropdown closes').to.not.exist; + expect(find('[data-test-members-subscription-option="none"]'), 'none option shown after selected').to.exist; + expect(find('[data-test-iframe="portal-preview"]')).to.not.exist; + expect(find('[data-test-portal-preview-disabled]')).to.exist; + + expect(find('[data-test-default-post-access] .ember-basic-dropdown-trigger')).to.have.attribute('aria-disabled', 'true'); + + await click('[data-test-button="save-settings"]'); + + expect(this.server.db.settings.findBy({key: 'members_signup_access'}).value).to.equal('none'); + + // automatically saves when switching back off nobody + await click('[data-test-members-subscription-option="none"]'); + await click('.ember-power-select-options [data-test-members-subscription-option="invite"]'); + expect(this.server.db.settings.findBy({key: 'members_signup_access'}).value).to.equal('invite'); + }); + + it('can change default post access', async function () { + await visit('/settings/members'); + + // fixtures match what we expect + expect(this.server.db.settings.findBy({key: 'default_content_visibility'}).value).to.equal('public'); + expect(this.server.db.settings.findBy({key: 'default_content_visibility_tiers'}).value).to.equal('[]'); + + expect(find('[data-test-default-post-access-option="public"]'), 'initial selection is "public"').to.exist; + expect(find('[data-test-default-post-access-tiers]')).to.not.exist; + + // open dropdown + await click('[data-test-default-post-access-option="public"]'); + + // all settings exist in dropdown + expect(find('.ember-power-select-options [data-test-default-post-access-option="public"]'), 'public option').to.exist; + expect(find('.ember-power-select-options [data-test-default-post-access-option="members"]'), 'members-only option').to.exist; + expect(find('.ember-power-select-options [data-test-default-post-access-option="paid"]'), 'paid-only option').to.exist; + expect(find('.ember-power-select-options [data-test-default-post-access-option="tiers"]'), 'specific tiers option').to.exist; + + // switch to members only + await click('.ember-power-select-options [data-test-default-post-access-option="members"]'); + await click('[data-test-button="save-settings"]'); + + expect(this.server.db.settings.findBy({key: 'default_content_visibility'}).value).to.equal('members'); + expect(this.server.db.settings.findBy({key: 'default_content_visibility_tiers'}).value).to.equal('[]'); + + expect(find('[data-test-default-post-access-option="members"]'), 'post-members selection is "members"').to.exist; + expect(find('[data-test-default-post-access-tiers]')).to.not.exist; + + // can switch to specific tiers + await click('[data-test-default-post-access-option="members"]'); + await click('.ember-power-select-options [data-test-default-post-access-option="tiers"]'); + + // tiers input is shown + expect(find('[data-test-default-post-access-tiers]')).to.exist; + + // open tiers dropdown + await click('[data-test-default-post-access-tiers] .ember-basic-dropdown-trigger'); + + // paid tiers are available in tiers input + expect(find('[data-test-default-post-access-tiers] [data-test-visibility-segment-option="Default Product"]')).to.exist; + + // select tier + await click('[data-test-default-post-access-tiers] [data-test-visibility-segment-option="Default Product"]'); + + // save + await click('[data-test-button="save-settings"]'); + expect(this.server.db.settings.findBy({key: 'default_content_visibility'}).value).to.equal('tiers'); + expect(this.server.db.settings.findBy({key: 'default_content_visibility_tiers'}).value).to.equal('["2"]'); + + // switch back to non-tiers option + await click('[data-test-default-post-access-option="tiers"]'); + await click('.ember-power-select-options [data-test-default-post-access-option="paid"]'); + + expect(find('[data-test-default-post-access-tiers]')).to.not.exist; + + await click('[data-test-button="save-settings"]'); + expect(this.server.db.settings.findBy({key: 'default_content_visibility'}).value).to.equal('paid'); + expect(this.server.db.settings.findBy({key: 'default_content_visibility_tiers'}).value).to.equal('["2"]'); + }); + + it('can manage free tier', async function () { + await visit('/settings/members'); + await click('[data-test-button="toggle-free-settings"]'); + expect(find('[data-test-free-settings-expanded]'), 'expanded free settings').to.exist; + + // we aren't viewing the non-labs-flag input + expect(find('[data-test-input="old-free-welcome-page"]')).to.not.exist; + + // it can set free signup welcome page + + // initial value + expect(find('[data-test-input="free-welcome-page"]')).to.exist; + expect(find('[data-test-input="free-welcome-page"]')).to.have.value(''); + + // saving + await fillIn('[data-test-input="free-welcome-page"]', 'not a url'); + await blur('[data-test-input="free-welcome-page"]'); + await click('[data-test-button="save-settings"]'); + + expect(this.server.db.products.findBy({slug: 'free'}).welcomePageUrl) + .to.equal('/not%20a%20url'); + + // re-rendering will insert full URL in welcome page input + await visit('/settings'); + await visit('/settings/members'); + + expect(find('[data-test-input="free-welcome-page"]')).to.exist; + expect(find('[data-test-input="free-welcome-page"]')) + .to.have.value('http://localhost:4200/not%20a%20url'); + + // it can manage free tier description and benefits + + // initial free tier details are as expected + expect(find('[data-test-product-card="free"]')).to.exist; + expect(find('[data-test-product-card="free"] [data-test-name]')).to.contain.text('Free'); + expect(find('[data-test-product-card="free"] [data-test-description]')).to.contain.text('No description'); + expect(find('[data-test-product-card="free"] [data-test-benefits]')).to.contain.text('No benefits'); + expect(find('[data-test-product-card="free"] [data-test-free-price]')).to.exist; + + // open modal + await click('[data-test-product-card="free"] [data-test-button="edit-product"]'); + + // initial modal state is as expected + const modal = '[data-test-modal="edit-product"]'; + expect(find(modal)).to.exist; + expect(find(`${modal} [data-test-input="product-name"]`)).to.not.exist; + expect(find(`${modal} [data-test-input="product-description"]`)).to.not.exist; + expect(find(`${modal} [data-test-input="free-product-description"]`)).to.exist; + expect(find(`${modal} [data-test-input="free-product-description"]`)).to.have.value(''); + expect(find(`${modal} [data-test-formgroup="prices"]`)).to.not.exist; + expect(find(`${modal} [data-test-benefit-item="new"]`)).to.exist; + expect(findAll(`${modal} [data-test-benefit-item]`).length).to.equal(1); + + expect(find(`${modal} [data-test-tierpreview-title]`)).to.contain.text('Free Membership Preview'); + expect(find(`${modal} [data-test-tierpreview-description]`)).to.contain.text('Free preview of'); + expect(find(`${modal} [data-test-tierpreview-benefits]`)).to.contain.text('Access to all public posts'); + expect(find(`${modal} [data-test-tierpreview-price]`).textContent).to.match(/\$\s+0/); + + // can change description + await fillIn(`${modal} [data-test-input="free-product-description"]`, 'Test description'); + expect(find(`${modal} [data-test-tierpreview-description]`)).to.contain.text('Test description'); + + // can manage benefits + const newBenefit = `${modal} [data-test-benefit-item="new"]`; + await fillIn(`${newBenefit} [data-test-input="benefit-label"]`, 'First benefit'); + await click(`${newBenefit} [data-test-button="add-benefit"]`); + + expect(find(`${modal} [data-test-tierpreview-benefits]`)).to.contain.text('First benefit'); + + expect(find(`${modal} [data-test-benefit-item="0"]`)).to.exist; + expect(find(`${modal} [data-test-benefit-item="new"]`)).to.exist; + + await click(`${newBenefit} [data-test-button="add-benefit"]`); + expect(find(`${newBenefit}`)).to.contain.text('Please enter a benefit'); + + await fillIn(`${newBenefit} [data-test-input="benefit-label"]`, 'Second benefit'); + await click(`${newBenefit} [data-test-button="add-benefit"]`); + + expect(find(`${modal} [data-test-tierpreview-benefits]`)).to.contain.text('Second benefit'); + expect(findAll(`${modal} [data-test-tierpreview-benefits] li`).length).to.equal(2); + + await click(`${modal} [data-test-benefit-item="0"] [data-test-button="delete-benefit"]`); + + expect(find(`${modal} [data-test-tierpreview-benefits]`)).to.not.contain.text('First benefit'); + expect(findAll(`${modal} [data-test-tierpreview-benefits] li`).length).to.equal(1); + + await click('[data-test-button="save-product"]'); + + expect(find(`${modal}`)).to.not.exist; + expect(find('[data-test-product-card="free"] [data-test-name]')).to.contain.text('Free'); + expect(find('[data-test-product-card="free"] [data-test-description]')).to.contain.text('Test description'); + expect(find('[data-test-product-card="free"] [data-test-benefits]')).to.contain.text('Benefits (1)'); + expect(find('[data-test-product-card="free"] [data-test-benefits] li:nth-of-type(1)')).to.contain.text('Second benefit'); + + const freeProduct = this.server.db.products.findBy({slug: 'free'}); + expect(freeProduct.description).to.equal('Test description'); + expect(freeProduct.welcomePageUrl).to.equal('/not%20a%20url'); + expect(freeProduct.productBenefitIds.length).to.equal(1); + const benefits = this.server.db.productBenefits.find(freeProduct.productBenefitIds); + expect(benefits[0].name).to.equal('Second benefit'); + }); +}); diff --git a/ghost/admin/tests/helpers/labs-flag.js b/ghost/admin/tests/helpers/labs-flag.js index 9aa985c7d4..b3f5cb8b12 100644 --- a/ghost/admin/tests/helpers/labs-flag.js +++ b/ghost/admin/tests/helpers/labs-flag.js @@ -10,7 +10,8 @@ export function enableLabsFlag(server, flag) { const config = server.schema.configs.first(); config.update({enableDeveloperExperiments: true}); - const labsSetting = {}; + const existingSetting = server.db.settings.findBy({key: 'labs'}).value; + const labsSetting = existingSetting ? JSON.parse(existingSetting) : {}; labsSetting[flag] = true; server.db.settings.update({key: 'labs'}, {value: JSON.stringify(labsSetting)});