🐛 Fixed signup card in post plaintext and email preheader (#17163)

fixes https://github.com/TryGhost/Team/issues/3542

The signup card text was included in the post plaintext/excerpt and
email preheader
This commit is contained in:
Simon Backx 2023-06-29 14:45:30 +02:00 committed by GitHub
parent e6dbc0bc4c
commit c90424542e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 5 deletions

View File

@ -5,10 +5,17 @@ const configUtils = require('../../../utils/configUtils');
const {sendEmail} = require('./utils');
const cheerio = require('cheerio');
/**
* Remove the preheader span from the email html and put it in a separate field called preheader
* @template {{html: string}} T
* @param {T} data
* @returns {asserts data is T & {preheader: string}}
*/
function splitPreheader(data) {
// Remove the preheader span from the email using cheerio
const $ = cheerio.load(data.html);
const preheader = $('.preheader');
// @ts-ignore
data.preheader = preheader.html();
preheader.remove();
data.html = $.html();
@ -120,10 +127,8 @@ describe('Can send cards via email', function () {
// Check the plaintext does contain the paragraph, but doesn't contain the signup card
assert.ok(!data.html.includes('Sign up for Koenig Lexical'));
// This is a bug! The plaintext and preheader should not contain the signup card
//assert.ok(!data.plaintext.includes('Sign up for Koenig Lexical'));
//assert.ok(!data.preheader.includes('Sign up for Koenig Lexical'));
assert.ok(!data.plaintext.includes('Sign up for Koenig Lexical'));
assert.ok(!data.preheader.includes('Sign up for Koenig Lexical'));
assert.ok(data.html.includes('This is a paragraph'));
assert.ok(data.plaintext.includes('This is a paragraph'));

View File

@ -58,6 +58,10 @@ async function createPublishedPostEmail(agent, settings = {}, email_recipient_fi
}
let lastEmailModel;
/**
*
* @returns {Promise<{html: string, plaintext: string, emailModel: any, recipientData: any}>}
*/
async function sendEmail(agent, settings, email_recipient_filter) {
// Prepare a post and email model
const completedPromise = jobManager.awaitCompletion('batch-sending-service-job');

View File

@ -53,7 +53,9 @@ const loadConverters = () => {
// Don't output hrs
{selector: 'hr', format: 'skip'},
// Don't output > in blockquotes
{selector: 'blockquote', format: 'block'}
{selector: 'blockquote', format: 'block'},
// Don't include signup cards in excerpts
{selector: '.kg-signup-card', format: 'skip'}
]
});