diff --git a/core/shared/labs.js b/core/shared/labs.js index 888f75ac1d..5b602a6fd5 100644 --- a/core/shared/labs.js +++ b/core/shared/labs.js @@ -21,6 +21,7 @@ const GA_FEATURES = [ 'selectablePortalLinks', 'membersTableStatus', 'improvedOnboarding', + 'multipleNewsletters', 'membersActivityFeed' ]; @@ -36,7 +37,6 @@ const ALPHA_FEATURES = [ 'urlCache', 'beforeAfterCard', 'tweetGridCard', - 'multipleNewsletters', 'multipleNewslettersUI', 'dashboardV5', 'publishingFlow' diff --git a/test/e2e-api/admin/__snapshots__/settings.test.js.snap b/test/e2e-api/admin/__snapshots__/settings.test.js.snap index df8f0213ef..8944ed3fca 100644 --- a/test/e2e-api/admin/__snapshots__/settings.test.js.snap +++ b/test/e2e-api/admin/__snapshots__/settings.test.js.snap @@ -152,7 +152,7 @@ Object { "key": "labs", "type": "object", "updated_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, - "value": "{\\"multipleProducts\\":true,\\"tierWelcomePages\\":true,\\"tierName\\":true,\\"selectablePortalLinks\\":true,\\"membersTableStatus\\":true,\\"improvedOnboarding\\":true,\\"membersActivityFeed\\":true,\\"members\\":true}", + "value": "{\\"multipleProducts\\":true,\\"tierWelcomePages\\":true,\\"tierName\\":true,\\"selectablePortalLinks\\":true,\\"membersTableStatus\\":true,\\"improvedOnboarding\\":true,\\"multipleNewsletters\\":true,\\"membersActivityFeed\\":true,\\"members\\":true}", }, Object { "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, @@ -192,7 +192,7 @@ exports[`Settings API Can edit a setting 2: [headers] 1`] = ` Object { "access-control-allow-origin": "http://127.0.0.1:2369", "cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0", - "content-length": "3979", + "content-length": "4008", "content-type": "application/json; charset=utf-8", "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/, "vary": "Origin, Accept-Encoding", @@ -873,7 +873,7 @@ Object { "key": "labs", "type": "object", "updated_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, - "value": "{\\"activitypub\\":true,\\"oauthLogin\\":true,\\"membersActivity\\":true,\\"urlCache\\":true,\\"beforeAfterCard\\":true,\\"tweetGridCard\\":true,\\"multipleNewsletters\\":true,\\"multipleNewslettersUI\\":true,\\"dashboardV5\\":true,\\"publishingFlow\\":true,\\"multipleProducts\\":true,\\"tierWelcomePages\\":true,\\"tierName\\":true,\\"selectablePortalLinks\\":true,\\"membersTableStatus\\":true,\\"improvedOnboarding\\":true,\\"membersActivityFeed\\":true,\\"members\\":true}", + "value": "{\\"activitypub\\":true,\\"oauthLogin\\":true,\\"membersActivity\\":true,\\"urlCache\\":true,\\"beforeAfterCard\\":true,\\"tweetGridCard\\":true,\\"multipleNewslettersUI\\":true,\\"dashboardV5\\":true,\\"publishingFlow\\":true,\\"multipleProducts\\":true,\\"tierWelcomePages\\":true,\\"tierName\\":true,\\"selectablePortalLinks\\":true,\\"membersTableStatus\\":true,\\"improvedOnboarding\\":true,\\"multipleNewsletters\\":true,\\"membersActivityFeed\\":true,\\"members\\":true}", }, Object { "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, diff --git a/test/unit/server/services/mega/mega.test.js b/test/unit/server/services/mega/mega.test.js index d00c5c0c64..6683932281 100644 --- a/test/unit/server/services/mega/mega.test.js +++ b/test/unit/server/services/mega/mega.test.js @@ -15,7 +15,10 @@ describe('MEGA', function () { // via transformEmailRecipientFilter it('throws when "free" or "paid" strings are used as a email_recipient_filter', async function () { const postModel = { - get: sinon.stub().returns('free') + get: sinon.stub().returns('free'), + related: sinon.stub().returns({ + fetch: sinon.stub().returns(null) + }) }; try { @@ -30,7 +33,10 @@ describe('MEGA', function () { // via transformEmailRecipientFilter it('throws when "none" is used as a email_recipient_filter', async function () { const postModel = { - get: sinon.stub().returns('none') + get: sinon.stub().returns('none'), + related: sinon.stub().returns({ + fetch: sinon.stub().returns(null) + }) }; try { diff --git a/test/unit/server/services/members/middleware.test.js b/test/unit/server/services/members/middleware.test.js index 4b1cdf9a3b..26f7a3afaa 100644 --- a/test/unit/server/services/members/middleware.test.js +++ b/test/unit/server/services/members/middleware.test.js @@ -233,7 +233,8 @@ describe('Members Service Middleware', function () { members_support_address: 'noreply@example.com', prices: [], products: [], - portal_products: '' + portal_products: '', + newsletters: [] } }).should.be.true(); });