From 07b6cda3db218002e263377cca74eff1ea006454 Mon Sep 17 00:00:00 2001 From: Simon Backx Date: Fri, 24 Mar 2023 10:31:48 +0100 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20Added=20subscription=20details=20to?= =?UTF-8?q?=20newsletters?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fixes https://github.com/TryGhost/Team/issues/2674 Co-authored-by: Sanne de Vries --- ghost/email-service/lib/email-renderer.js | 2 +- .../email-service/test/email-renderer.test.js | 36 ------------------- 2 files changed, 1 insertion(+), 37 deletions(-) diff --git a/ghost/email-service/lib/email-renderer.js b/ghost/email-service/lib/email-renderer.js index 35881d977d..3c2493b7c2 100644 --- a/ghost/email-service/lib/email-renderer.js +++ b/ghost/email-service/lib/email-renderer.js @@ -834,7 +834,7 @@ class EmailRenderer { name: newsletter.get('name'), showPostTitleSection: newsletter.get('show_post_title_section'), showCommentCta: newsletter.get('show_comment_cta') && this.#settingsCache.get('comments_enabled') !== 'off' && !hasEmailOnlyFlag, - showSubscriptionDetails: newsletter.get('show_subscription_details') && this.#labs.isSet('makingItRain') + showSubscriptionDetails: newsletter.get('show_subscription_details') }, latestPosts, latestPostsHasImages, diff --git a/ghost/email-service/test/email-renderer.test.js b/ghost/email-service/test/email-renderer.test.js index 2b5403120e..8df0c149df 100644 --- a/ghost/email-service/test/email-renderer.test.js +++ b/ghost/email-service/test/email-renderer.test.js @@ -1587,24 +1587,6 @@ describe('Email renderer', function () { assert.equal(data.newsletter.showCommentCta, true); }); - it('showSubscriptionDetails is disabled if labs disabled', async function () { - labsEnabled = false; - const html = ''; - const post = createModel({ - posts_meta: createModel({}), - loaded: ['posts_meta'], - published_at: new Date(0) - }); - const newsletter = createModel({ - title_font_category: 'serif', - title_alignment: 'left', - body_font_category: 'sans_serif', - show_subscription_details: true - }); - const data = await emailRenderer.getTemplateData({post, newsletter, html, addPaywall: false}); - assert.equal(data.newsletter.showSubscriptionDetails, false); - }); - it('showSubscriptionDetails works is enabled', async function () { labsEnabled = true; const html = ''; @@ -1659,24 +1641,6 @@ describe('Email renderer', function () { assert.deepEqual(data.latestPosts, []); }); - it('latestPosts can be disabled via labs', async function () { - labsEnabled = false; - const html = ''; - const post = createModel({ - posts_meta: createModel({}), - loaded: ['posts_meta'], - published_at: new Date(0) - }); - const newsletter = createModel({ - title_font_category: 'serif', - title_alignment: 'left', - body_font_category: 'sans_serif', - show_latest_posts: true - }); - const data = await emailRenderer.getTemplateData({post, newsletter, html, addPaywall: false}); - assert.deepEqual(data.latestPosts, []); - }); - it('latestPosts can be enabled', async function () { labsEnabled = true; const html = '';