From b240497fee2a1623859fca53cc27840cc37fa7f5 Mon Sep 17 00:00:00 2001 From: Steve Larson <9larsons@gmail.com> Date: Mon, 22 Jun 2026 13:21:19 -0500 Subject: [PATCH 1/3] Fixed and re-enabled the batch-sending integration tests no ref The suite was skipped in early 2025 for "intermittent" failures, but had since rotted into deterministic failure: the email-renderer template was rewritten (copyright year now 2026) so every snapshot was stale, and two Replacements tests hardcoded the unsubscribe-link port 2369, which the Mocha to Vitest migration made per-fork. Regenerated the snapshots and matched the port flexibly (the snapshots already scrub it); 42/42 pass, stable across repeated runs. A latent within-file ordering dependency remains (dormant, since CI preserves declaration order) and is worth hardening separately. --- .../__snapshots__/batch-sending.test.js.snap | 12570 +++++++++------- .../email-service/batch-sending.test.js | 13 +- 2 files changed, 7547 insertions(+), 5036 deletions(-) diff --git a/ghost/core/test/integration/services/email-service/__snapshots__/batch-sending.test.js.snap b/ghost/core/test/integration/services/email-service/__snapshots__/batch-sending.test.js.snap index 6721330dbed..0b9d0fbbe84 100644 --- a/ghost/core/test/integration/services/email-service/__snapshots__/batch-sending.test.js.snap +++ b/ghost/core/test/integration/services/email-service/__snapshots__/batch-sending.test.js.snap @@ -1,30 +1,128 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP +// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing exports[`Batch sending tests HTML-content Does not HTML escape feature_image_caption 1 1`] = ` Object { "html": " - + A random test post + - + A random test post – - - - - - - + + + +
  -
- - - - + +
+  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­   +
+ + +
+ + + + + + +
  +
+ + - - - +
+ - +
@@ -526,7 +586,7 @@ table.body h2 span {
@@ -534,24 +594,30 @@ table.body h2 span {
- A random test post + + + + + +
+ A random test post +
+ - - - - +
+ By Joe Bloggs • date - View in browser + + View in browser
- View in browser +
+ View in browser
@@ -566,13 +632,45 @@ table.body h2 span {
-
+
Testing feature image caption
+
+
+ 		 
+ + + + + + + + @@ -627,11 +738,13 @@ table.body h2 span { -  +  + + @@ -669,6 +782,9 @@ Daily newsletter [http://127.0.0.1:2369/r/xxxxxx?m=member-uuid] + + + A random test post [http://127.0.0.1:2369/r/xxxxxx?m=member-uuid] @@ -679,6 +795,9 @@ A random test post [http://127.0.0.1:2369/r/xxxxxx?m=member-uuid] + + + By Joe Bloggs • date @@ -715,6 +834,7 @@ Testing feature image caption +  @@ -726,15 +846,14 @@ Testing feature image caption +  -Ghost © 2025 – Unsubscribe [http://127.0.0.1:2369/unsubscribe/?uuid=member-uuid&key=xxxxxx&newsletter=requested-newsletter-uuid] -https://ghost.org/?via=pbg-newsletter&ref=127.0.0.1 @@ -746,237 +865,483 @@ https://ghost.org/?via=pbg-newsletter&ref=127.0.0.1 -  -", -} -`; -exports[`Batch sending tests Newsletter settings Hides comments button for email only posts 1 1`] = ` -Object { - "html": " - - - - - - This is a test post title - + + + + Hello world + +
+  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­   +
+ + +
  +
+ +
+ - + + @@ -592,7 +704,7 @@ table.body h2 span { - -
+ @@ -585,6 +683,20 @@ table.body h2 span { +
+ + + + +
+ + \\"Comment\\" +

Comment

+ +
+
- + @@ -601,8 +713,7 @@ table.body h2 span {
Ghost © 2025 – UnsubscribeGhost © 2026 – Unsubscribe
+
+ + + + + - - +This is a test post title [http://127.0.0.1:2369/this-is-a-test-post-title-13/] - -
  +
+ + + + @@ -2100,11 +2499,13 @@ table.body h2 span { -  +  + + @@ -2142,6 +2543,9 @@ Daily newsletter [http://127.0.0.1:2369/] + + + This is a test post title [http://127.0.0.1:2369/this-is-a-test-post-title-6/] @@ -2152,6 +2556,9 @@ This is a test post title [http://127.0.0.1:2369/this-is-a-test-post-title-6/] + + + By Joe Bloggs • date @@ -2172,6 +2579,36 @@ View in browser [http://127.0.0.1:2369/this-is-a-test-post-title-6/] + + + +  + + + + + + + + + + + +  + + + + + + + + + + + + + + Hello world @@ -2192,7 +2629,7 @@ Hello world -Ghost © 2025 – Unsubscribe [unsubscribe_url] +Ghost © 2026 – Unsubscribe [unsubscribe_url] @@ -2207,7 +2644,6 @@ https://ghost.org/?via=pbg-newsletter -   @@ -2220,194 +2656,391 @@ https://ghost.org/?via=pbg-newsletter exports[`Batch sending tests Newsletter settings Hides comments button if disabled in newsletter 1 1`] = ` Object { "html": " - +This is a test post title + + + + Hello world + +
+  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­   +
+ + +
+ + + + - table.body .kg-cta-immersive.kg-cta-has-img:not(.kg-cta-bg-none):not(.kg-cta-no-label) table.kg-cta-content-wrapper { - padding-top: 0; - } + + + - table.body .kg-cta-immersive .kg-cta-image-container { - padding-bottom: 20px; - } - - table.body .kg-cta-immersive.kg-cta-no-text .kg-cta-image-container { - padding-bottom: 0; - } - - table.body .kg-cta-button-container { - padding-top: 16px; - } - - table.body .kg-cta-minimal .kg-cta-image-container { - display: inline-block !important; - width: 100% !important; - padding: 0 !important; - padding-bottom: 16px !important; - padding-right: 0 !important; - } - - table.body .kg-cta-minimal .kg-cta-content-inner { - display: inline-block !important; - width: 100% !important; - padding: 0 !important; - } - - table.body .kg-cta-minimal img.kg-cta-image { - width: 52px !important; - height: 52px !important; - } - - table.body .kg-cta-minimal a.kg-cta-button { - display: inline-block !important; - } - - table.body .kg-cta-minimal table.kg-cta-button-wrapper td { - padding: 4px 16px 5px; - } - - table.body .kg-cta-immersive .kg-cta-button-wrapper { - padding: 6px 18px 7px; - } -} -@media all { - .subscription-details p.hidden { - display: none !important; - } - - .ExternalClass { - width: 100%; - } - - .ExternalClass, -.ExternalClass p, -.ExternalClass span, -.ExternalClass font, -.ExternalClass td, -.ExternalClass div { - line-height: 100%; - } - - .apple-link a { - color: inherit !important; - font-family: inherit !important; - font-size: inherit !important; - font-weight: inherit !important; - line-height: inherit !important; - text-decoration: none !important; - } - - #MessageViewBody a { - color: inherit; - text-decoration: none; - font-size: inherit; - font-family: inherit; - font-weight: inherit; - line-height: inherit; - } - - .btn-primary table td:hover { - background-color: #34495e !important; - } - - .btn-primary a:hover { - background-color: #34495e !important; - border-color: #34495e !important; - } -} - - - - Hello world -
+ + + +
+ + + + + + + - table.body .kg-cta-minimal .kg-cta-image-container { - padding-right: 20px; - } +
+
- - - - - + + + +
  -
- - - - - - + +
- - - - - - - + - - - - - +
- - - -
+
- - - - - - - + + +
+ This is a test post title +
- This is a test post title -
+ - - - - +
+ By Joe Bloggs • date - View in browser + + View in browser
- View in browser +
+ View in browser
+
+
+ 		 
+ + + + + + + + @@ -1369,11 +1634,13 @@ table.body h2 span { -  +  + + @@ -1411,6 +1678,9 @@ Daily newsletter [http://127.0.0.1:2369/] + + + This is a test post title [http://127.0.0.1:2369/email/post-uuid/] @@ -1421,6 +1691,9 @@ This is a test post title [http://127.0.0.1:2369/email/post-uuid/] + + + By Joe Bloggs • date @@ -1441,6 +1714,36 @@ View in browser [http://127.0.0.1:2369/email/post-uuid/] + + + +  + + + + + + + + + + + +  + + + + + + + + + + + + + + Hello world @@ -1461,7 +1764,7 @@ Hello world -Ghost © 2025 – Unsubscribe [unsubscribe_url] +Ghost © 2026 – Unsubscribe [unsubscribe_url] @@ -1476,7 +1779,6 @@ https://ghost.org/?via=pbg-newsletter -   @@ -1489,513 +1791,573 @@ https://ghost.org/?via=pbg-newsletter exports[`Batch sending tests Newsletter settings Hides comments button if comments disabled 1 1`] = ` Object { "html": " - +This is a test post title + - + Hello world -
  +
+ +
+ - @@ -1334,7 +1600,7 @@ table.body h2 span { - -
+ -

Hello world

+

Hello world

 - + @@ -1343,8 +1609,7 @@ table.body h2 span {
Ghost © 2025 – UnsubscribeGhost © 2026 – Unsubscribe
+
- - - - - + + + +
  -
- - - - + +
+  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­   +
+ + +
+ + + + + + +
  +
+ + - - - - - - +
+ - +
@@ -2012,7 +2374,7 @@ table.body h2 span {
@@ -2020,38 +2382,76 @@ table.body h2 span {
- This is a test post title + + + + + +
+ This is a test post title +
+ - - - - +
+ By Joe Bloggs • date - View in browser + + View in browser
- View in browser +
+ View in browser
- -

Hello world

- - -
+
+
+ 		 
+ + + + + + + +
  +
+ + @@ -2065,7 +2465,7 @@ table.body h2 span { - -
+ + + +
+ +

Hello world

+ + +
- + @@ -2074,8 +2474,7 @@ table.body h2 span {
Ghost © 2025 – UnsubscribeGhost © 2026 – Unsubscribe
+
+ + + + + - - - -
  +
+ + + + - - - - - +  + + -
+ + + + - table.body .kg-cta-immersive .kg-cta-image-container { - padding-bottom: 20px; - } + + + - table.body .kg-cta-button-container { - padding-top: 16px; - } - - table.body .kg-cta-minimal .kg-cta-image-container { - display: inline-block !important; - width: 100% !important; - padding: 0 !important; - padding-bottom: 16px !important; - padding-right: 0 !important; - } - - table.body .kg-cta-minimal .kg-cta-content-inner { - display: inline-block !important; - width: 100% !important; - padding: 0 !important; - } - - table.body .kg-cta-minimal img.kg-cta-image { - width: 52px !important; - height: 52px !important; - } - - table.body .kg-cta-minimal a.kg-cta-button { - display: inline-block !important; - } - - table.body .kg-cta-minimal table.kg-cta-button-wrapper td { - padding: 4px 16px 5px; - } - - table.body .kg-cta-immersive .kg-cta-button-wrapper { - padding: 6px 18px 7px; - } -} -@media all { - .subscription-details p.hidden { - display: none !important; - } - - .ExternalClass { - width: 100%; - } - - .ExternalClass, -.ExternalClass p, -.ExternalClass span, -.ExternalClass font, -.ExternalClass td, -.ExternalClass div { - line-height: 100%; - } - - .apple-link a { - color: inherit !important; - font-family: inherit !important; - font-size: inherit !important; - font-weight: inherit !important; - line-height: inherit !important; - text-decoration: none !important; - } - - #MessageViewBody a { - color: inherit; - text-decoration: none; - font-size: inherit; - font-family: inherit; - font-weight: inherit; - line-height: inherit; - } - - .btn-primary table td:hover { - background-color: #34495e !important; - } - - .btn-primary a:hover { - background-color: #34495e !important; - border-color: #34495e !important; - } -} - - - - Hello world -
+ + + +
+ + + + + + + - table.body .kg-cta-immersive.kg-cta-no-text .kg-cta-image-container { - padding-bottom: 0; - } +
+
- - - - - + + + +
  -
- - - - - - + +
- - - - - - - + - - - - - +
- - - -
+
- - - - - - - + + +
+ This is a test post title +
- This is a test post title -
+ - - - - +
+ By Joe Bloggs • date - View in browser + + View in browser
- View in browser +
+ View in browser
+
+
+ 		 
+ + + + + + + + @@ -2831,11 +3364,13 @@ table.body h2 span { -  +  + + @@ -2873,6 +3408,9 @@ Daily newsletter [http://127.0.0.1:2369/] + + + This is a test post title [http://127.0.0.1:2369/this-is-a-test-post-title-7/] @@ -2883,6 +3421,9 @@ This is a test post title [http://127.0.0.1:2369/this-is-a-test-post-title-7/] + + + By Joe Bloggs • date @@ -2903,6 +3444,36 @@ View in browser [http://127.0.0.1:2369/this-is-a-test-post-title-7/] + + + +  + + + + + + + + + + + +  + + + + + + + + + + + + + + Hello world @@ -2923,7 +3494,7 @@ Hello world -Ghost © 2025 – Unsubscribe [unsubscribe_url] +Ghost © 2026 – Unsubscribe [unsubscribe_url] @@ -2938,7 +3509,6 @@ https://ghost.org/?via=pbg-newsletter -   @@ -2951,194 +3521,391 @@ https://ghost.org/?via=pbg-newsletter exports[`Batch sending tests Newsletter settings Hides post title section if show_post_title_section is false 1 1`] = ` Object { "html": " - +This is a test post title + - + Hello world -
  +
+ +
+ - @@ -2796,7 +3330,7 @@ table.body h2 span { - -
+ -

Hello world

+

Hello world

 - + @@ -2805,8 +3339,7 @@ table.body h2 span {
Ghost © 2025 – UnsubscribeGhost © 2026 – Unsubscribe
+
- - - - - - -
  -
- - - - + +
+  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­   +
+ + +
+ + + + + + + + +
  +
+ + - + +
+ - +
@@ -3468,13 +4098,13 @@ table.body h2 span {
+ - +
@@ -3482,10 +4112,42 @@ table.body h2 span {
+
+
+ 		 
+ + + + + + + + @@ -3538,11 +4213,13 @@ table.body h2 span { -  +  + + @@ -3582,6 +4259,36 @@ Daily newsletter [http://127.0.0.1:2369/r/xxxxxx?m=member-uuid] + + + +  + + + + + + + + + + + +  + + + + + + + + + + + + + + Hello world @@ -3602,11 +4309,14 @@ Hello world -Ghost © 2025 – Unsubscribe [http://127.0.0.1:2369/unsubscribe/?uuid=member-uuid&key=xxxxxx&newsletter=requested-newsletter-uuid] + +Comment + + +[http://127.0.0.1:2369/r/xxxxxx?m=member-uuid] -https://ghost.org/?via=pbg-newsletter&ref=127.0.0.1 @@ -3618,6 +4328,22 @@ https://ghost.org/?via=pbg-newsletter&ref=127.0.0.1 + +Ghost © 2026 – Unsubscribe [http://127.0.0.1:2369/unsubscribe/?uuid=member-uuid&key=xxxxxx&newsletter=requested-newsletter-uuid] + + + +https://ghost.org/?via=pbg-newsletter&ref=127.0.0.1 + + + + + + + + + +   @@ -3630,36 +4356,134 @@ https://ghost.org/?via=pbg-newsletter&ref=127.0.0.1 exports[`Batch sending tests Newsletter settings Hides post title section if show_post_title_section is false 2 1`] = ` Object { "html": " - +This is a test post title + - + Hello world -
  +
+ +
+ - @@ -3496,6 +4158,20 @@ table.body h2 span { + + + @@ -3503,7 +4179,7 @@ table.body h2 span { - -
+ -

Hello world

+

Hello world

+ + + + +
+ + \\"Comment\\" +

Comment

+ +
+
- + @@ -3512,8 +4188,7 @@ table.body h2 span {
Ghost © 2025 – UnsubscribeGhost © 2026 – Unsubscribe
+
- - - - - + + + +
  -
- - - - + +
+  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­   +
+ + +
+ + + + + + +
  +
+ + - - - - -
+ - +
@@ -4153,7 +4939,7 @@ table.body h2 span {
@@ -4161,79 +4947,225 @@ table.body h2 span {
- This is a test post title + + + + + +
+ This is a test post title +
+ - - - - +
+ By Joe Bloggs • date - View in browser + + View in browser
- View in browser +
+ View in browser
- -

Hello world

- +
+
+
+ 		 
+ + + + + + + + + + + + +
  +
+ + + + + + + + + + + + + + + +
+ + + + +
+ +

Hello world

+ + +
+
+ + + + +
+ + \\"Comment\\" +

Comment

+ +
+
+ + + + + + + + +
Ghost © 2026 – Unsubscribe
\\"Powered
+
+ +
+ 		 
+ + +", + "plaintext": " + + + + + + + + + + + +  + + + + + + + + + + + + + + + +http://127.0.0.1:2369/r/xxxxxx?m=member-uuid + + + + + + + + + +Ghost [http://127.0.0.1:2369/r/xxxxxx?m=member-uuid] + + +Daily newsletter [http://127.0.0.1:2369/r/xxxxxx?m=member-uuid] + + + + + + + + + + + + + +This is a test post title [http://127.0.0.1:2369/r/xxxxxx?m=member-uuid] + + + + + + + + + + + + +By Joe Bloggs • date + + +View in browser [http://127.0.0.1:2369/r/xxxxxx?m=member-uuid] + + + + +View in browser [http://127.0.0.1:2369/r/xxxxxx?m=member-uuid] + + + + + + + -
-
- - - - - - - -
Ghost © 2025 – Unsubscribe
\\"Powered
-
- -
- 		 
- - -", - "plaintext": " @@ -4256,10 +5188,10 @@ table.body h2 span { +Hello world -http://127.0.0.1:2369/r/xxxxxx?m=member-uuid @@ -4269,10 +5201,8 @@ http://127.0.0.1:2369/r/xxxxxx?m=member-uuid -Ghost [http://127.0.0.1:2369/r/xxxxxx?m=member-uuid] -Daily newsletter [http://127.0.0.1:2369/r/xxxxxx?m=member-uuid] @@ -4280,10 +5210,11 @@ Daily newsletter [http://127.0.0.1:2369/r/xxxxxx?m=member-uuid] +Comment +[http://127.0.0.1:2369/r/xxxxxx?m=member-uuid] -This is a test post title [http://127.0.0.1:2369/r/xxxxxx?m=member-uuid] @@ -4293,16 +5224,15 @@ This is a test post title [http://127.0.0.1:2369/r/xxxxxx?m=member-uuid] -By Joe Bloggs • date -View in browser [http://127.0.0.1:2369/r/xxxxxx?m=member-uuid] +Ghost © 2026 – Unsubscribe [http://127.0.0.1:2369/unsubscribe/?uuid=member-uuid&key=xxxxxx&newsletter=requested-newsletter-uuid] -View in browser [http://127.0.0.1:2369/r/xxxxxx?m=member-uuid] +https://ghost.org/?via=pbg-newsletter&ref=127.0.0.1 @@ -4313,67 +5243,280 @@ View in browser [http://127.0.0.1:2369/r/xxxxxx?m=member-uuid] -Hello world +  + +", +} +`; + +exports[`Batch sending tests Newsletter settings Shows 2 comment buttons for published posts with feedback enabled 1 1`] = ` +Object { + "html": " + + + + + + This is a test post title + + - + Hello world - - - - - - + + + +
  -
- - - - + +
+  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­   +
+ + +
+ + + + + + +
  +
+ + - - - +
+ - +
@@ -4884,7 +5838,7 @@ table.body h2 span {
@@ -4892,34 +5846,72 @@ table.body h2 span {
- This is a test post title + + + + + +
+ This is a test post title +
+ - - - - +
+ By Joe Bloggs • date - View in browser + + View in browser
- View in browser +
+ View in browser
+
+
+ 		 
+ + + + + + + + @@ -4995,11 +5989,13 @@ table.body h2 span { -  +  + + @@ -5037,6 +6033,9 @@ Daily newsletter [http://127.0.0.1:2369/] + + + This is a test post title [http://127.0.0.1:2369/this-is-a-test-post-title-4/] @@ -5047,6 +6046,9 @@ This is a test post title [http://127.0.0.1:2369/this-is-a-test-post-title-4/] + + + By Joe Bloggs • date @@ -5067,6 +6069,36 @@ View in browser [http://127.0.0.1:2369/this-is-a-test-post-title-4/] + + + +  + + + + + + + + + + + +  + + + + + + + + + + + + + + Hello world @@ -5092,7 +6124,8 @@ Hello world More like this -[http://127.0.0.1:2369/this-is-a-test-post-title-4/#/feedback/post-id/1/?uuid=member-uuid&key=xxxxxx] +[http://127.0.0.1:2369/members/feedback/post-id/1/?uuid=member-uuid&key=xxxxxx] + @@ -5101,7 +6134,8 @@ More like this Less like this -[http://127.0.0.1:2369/this-is-a-test-post-title-4/#/feedback/post-id/0/?uuid=member-uuid&key=xxxxxx] +[http://127.0.0.1:2369/members/feedback/post-id/0/?uuid=member-uuid&key=xxxxxx] + @@ -5110,7 +6144,7 @@ Less like this Comment -[http://127.0.0.1:2369/this-is-a-test-post-title-4/#ghost-comments] +[http://127.0.0.1:2369/this-is-a-test-post-title-4/#ghost-comments-root] @@ -5124,7 +6158,8 @@ Comment -Ghost © 2025 – Unsubscribe [http://127.0.0.1:2369/unsubscribe/?uuid=member-uuid&key=xxxxxx&newsletter=requested-newsletter-uuid] + +Ghost © 2026 – Unsubscribe [http://127.0.0.1:2369/unsubscribe/?uuid=member-uuid&key=xxxxxx&newsletter=requested-newsletter-uuid] @@ -5139,32 +6174,280 @@ https://ghost.org/?via=pbg-newsletter +  + + + + +", +} +`; + +exports[`Batch sending tests Newsletter settings Shows 2 comment buttons for published posts without feedback enabled 1 1`] = ` +Object { + "html": " + + + + + + This is a test post title + + - + Hello world -
  +
+ +
+ - @@ -4931,25 +5923,28 @@ table.body h2 span { - @@ -4960,7 +5955,7 @@ table.body h2 span { - -
+ -

Hello world

+

Hello world
+ - + + + +
- + + \\"More -

More like this

+

More like this

 - 		- + + \\"Less -

Less like this

+

Less like this

 - 		- + + \\"Comment\\" -

Comment

+

Comment

 -
- + @@ -4969,8 +5964,7 @@ table.body h2 span {
Ghost © 2025 – UnsubscribeGhost © 2026 – Unsubscribe
+
- - - - - + + + +
  -
- - - - + +
+  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­   +
+ + +
+ + + + + + +
  +
+ + - - - +
+ - +
@@ -5675,7 +6769,7 @@ table.body h2 span {
@@ -5683,34 +6777,72 @@ table.body h2 span {
- This is a test post title + + + + + +
+ This is a test post title +
+ - - - - +
+ By Joe Bloggs • date - View in browser + + View in browser
- View in browser +
+ View in browser
+
+
+ 		 
+ + + + + + + + @@ -5776,11 +6908,13 @@ table.body h2 span { -  +  + + @@ -5818,6 +6952,9 @@ Daily newsletter [http://127.0.0.1:2369/] + + + This is a test post title [http://127.0.0.1:2369/this-is-a-test-post-title-3/] @@ -5828,6 +6965,9 @@ This is a test post title [http://127.0.0.1:2369/this-is-a-test-post-title-3/] + + + By Joe Bloggs • date @@ -5848,6 +6988,36 @@ View in browser [http://127.0.0.1:2369/this-is-a-test-post-title-3/] + + + +  + + + + + + + + + + + +  + + + + + + + + + + + + + + Hello world @@ -5873,7 +7043,7 @@ Hello world Comment -[http://127.0.0.1:2369/this-is-a-test-post-title-3/#ghost-comments] +[http://127.0.0.1:2369/this-is-a-test-post-title-3/#ghost-comments-root] @@ -5887,12 +7057,12 @@ Comment -Ghost © 2025 – Unsubscribe [unsubscribe_url] +Ghost © 2026 – Unsubscribe [unsubscribe_url] -https://ghost.org/?via=pbg-newsletter +https://ghost.org/?via=pbg-newsletter @@ -7251,47 +8421,296 @@ Comment -Ghost © 2024 – Unsubscribe [unsubscribe_url] +Ghost © 2024 – Unsubscribe [unsubscribe_url] + + + +https://ghost.org/ + + + + + + + + + + + +  + + + + +", +} +`; + +exports[`Batch sending tests Newsletter settings Shows 3 latest posts 1 1`] = ` +Object { + "html": " + + + + + + This is the main post title + + - + Hello world -
  +
+ +
+ - @@ -5722,15 +6854,16 @@ table.body h2 span { - @@ -5741,7 +6874,7 @@ table.body h2 span { - -
+ -

Hello world

+

Hello world
+ - + +
- + + \\"Comment\\" -

Comment

+

Comment

 -
- + @@ -5750,8 +6883,7 @@ table.body h2 span {
Ghost © 2025 – UnsubscribeGhost © 2026 – Unsubscribe
+
- - - - - + + + +
  -
- - - - + +
+  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­   +
+ + +
+ + + + + + +
  +
+ + - - - +
+ - +
@@ -7802,7 +9032,7 @@ table.body h2 span {
@@ -7810,34 +9040,72 @@ table.body h2 span {
- This is the main post title + + + + + +
+ This is the main post title +
+ - - - - +
+ By Joe Bloggs • date - View in browser + + View in browser
- View in browser +
+ View in browser
+
+
+ 		 
+ + + + + + + + - - - -
  +
+ +
+ - @@ -7848,21 +9116,35 @@ table.body h2 span { + + + - - -
+ -

Hello world

+

Hello world

+ + + + +
+ + \\"Comment\\" +

Comment

+ +
+
-

Keep reading

+ 		+

Keep reading

@@ -7876,11 +9158,11 @@ table.body h2 span {
-

+

This is a test post title

-

- Hello world +

+ Hello world

@@ -7894,11 +9176,11 @@ table.body h2 span {
-

+

This is a test post title

-

- Hello world +

+ Hello world

@@ -7914,7 +9196,7 @@ table.body h2 span { - -
-

+

This is a test post title

-

- Hello world +

+ Hello world

- + @@ -7923,25 +9205,82 @@ table.body h2 span {
Ghost © 2025 – UnsubscribeGhost © 2026 – Unsubscribe
+
  
- - -", - "plaintext": " + +
+ + +", + "plaintext": " + + + + + + + + + + + +  + + + + + + + + + + + + + + + +http://127.0.0.1:2369/r/xxxxxx?m=member-uuid + + + + + + + + + +Ghost [http://127.0.0.1:2369/r/xxxxxx?m=member-uuid] + + +Daily newsletter [http://127.0.0.1:2369/r/xxxxxx?m=member-uuid] + + + + + + + + + + + + + +This is the main post title [http://127.0.0.1:2369/r/xxxxxx?m=member-uuid] + + + @@ -7949,15 +9288,17 @@ table.body h2 span { -  +By Joe Bloggs • date +View in browser [http://127.0.0.1:2369/r/xxxxxx?m=member-uuid] +View in browser [http://127.0.0.1:2369/r/xxxxxx?m=member-uuid] @@ -7967,31 +9308,29 @@ table.body h2 span { -http://127.0.0.1:2369/r/xxxxxx?m=member-uuid +  -Ghost [http://127.0.0.1:2369/r/xxxxxx?m=member-uuid] -Daily newsletter [http://127.0.0.1:2369/r/xxxxxx?m=member-uuid] +  -This is the main post title [http://127.0.0.1:2369/r/xxxxxx?m=member-uuid] @@ -8001,15 +9340,13 @@ This is the main post title [http://127.0.0.1:2369/r/xxxxxx?m=member-uuid] -By Joe Bloggs • date +Hello world -View in browser [http://127.0.0.1:2369/r/xxxxxx?m=member-uuid] -View in browser [http://127.0.0.1:2369/r/xxxxxx?m=member-uuid] @@ -8021,12 +9358,14 @@ View in browser [http://127.0.0.1:2369/r/xxxxxx?m=member-uuid] -Hello world + +Comment +[http://127.0.0.1:2369/r/xxxxxx?m=member-uuid] @@ -8127,7 +9466,7 @@ Hello world [http://127.0.0.1:2369/r/xxxxxx?m=member-uuid] -Ghost © 2025 – Unsubscribe [http://127.0.0.1:2369/unsubscribe/?uuid=member-uuid&key=xxxxxx&newsletter=requested-newsletter-uuid] +Ghost © 2026 – Unsubscribe [http://127.0.0.1:2369/unsubscribe/?uuid=member-uuid&key=xxxxxx&newsletter=requested-newsletter-uuid] @@ -8142,7 +9481,6 @@ https://ghost.org/?via=pbg-newsletter&ref=127.0.0.1 -   @@ -8150,24 +9488,273 @@ https://ghost.org/?via=pbg-newsletter&ref=127.0.0.1 ", } -`; - -exports[`Batch sending tests Newsletter settings Shows subscription details box for canceled paid member 1 1`] = ` -Object { - "html": " - - - - - - This is a test post title - + - + Hello world - - - - - - + + + +
  -
- - - - + +
+  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­   +
+ + +
+ + + + + + +
  +
+ + - - - +
+ - +
@@ -8678,7 +10076,7 @@ table.body h2 span {
@@ -8686,34 +10084,72 @@ table.body h2 span {
- This is a test post title + + + + + +
+ This is a test post title +
+ - - - - +
+ By Joe Bloggs • date - View in browser + + View in browser
- View in browser +
+ View in browser
+
+
+ 		 
+ + + + + + + + @@ -8786,11 +10235,13 @@ table.body h2 span { -  +  + + @@ -8828,7 +10279,13 @@ Daily newsletter [http://127.0.0.1:2369/] -This is a test post title [http://127.0.0.1:2369/this-is-a-test-post-title-12/] + + + +This is a test post title [http://127.0.0.1:2369/this-is-a-test-post-title-14/] + + + @@ -8841,12 +10298,42 @@ This is a test post title [http://127.0.0.1:2369/this-is-a-test-post-title-12/] By Joe Bloggs • date -View in browser [http://127.0.0.1:2369/this-is-a-test-post-title-12/] +View in browser [http://127.0.0.1:2369/this-is-a-test-post-title-14/] + + + + +View in browser [http://127.0.0.1:2369/this-is-a-test-post-title-14/] + + + + + + + + + + + + + + +  + + + + + + -View in browser [http://127.0.0.1:2369/this-is-a-test-post-title-12/] + +  + + + @@ -8876,6 +10363,26 @@ Hello world + + + + +Comment + + +[http://127.0.0.1:2369/this-is-a-test-post-title-14/#ghost-comments-root] + + + + + + + + + + + + Subscription details @@ -8900,7 +10407,7 @@ Member since: date -Manage subscription → [http://127.0.0.1:2369/#/portal/account] +Manage subscription [http://127.0.0.1:2369/#/portal/account] @@ -8913,7 +10420,7 @@ Manage subscription → [http://127.0.0.1:2369/#/portal/account] -Ghost © 2025 – Unsubscribe [unsubscribe_url] +Ghost © 2026 – Unsubscribe [unsubscribe_url] @@ -8928,32 +10435,280 @@ https://ghost.org/?via=pbg-newsletter +  + + + + +", +} +`; + +exports[`Batch sending tests Newsletter settings Shows subscription details box for comped members 1 1`] = ` +Object { + "html": " + + + + + + This is a test post title + + - + Hello world -
  +
+ +
+ - @@ -8724,23 +10160,37 @@ table.body h2 span { + + + - -
+ -

Hello world

+

Hello world

+ + + + +
+ + \\"Comment\\" +

Comment

+ +
+
-

Subscription details

-

+

Subscription details

+

You are receiving this because you are a paid subscriber to Ghost. Your subscription has been canceled and will expire on date. You can resume your subscription via your account settings.

-
-

Name: not provided

-

Email: canceled-paid@example.com

-

Member since: date

+

Name: not provided

+

Email: canceled-paid@example.com

+

Member since: date

 - Manage subscription → + + Manage subscription
@@ -8751,7 +10201,7 @@ table.body h2 span { 		- + @@ -8760,8 +10210,7 @@ table.body h2 span {
Ghost © 2025 – UnsubscribeGhost © 2026 – Unsubscribe
+
- - - - - + + + +
  -
- - - - + +
+  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­   +
+ + +
+ + + + + + +
  +
+ + - - - +
+ - +
@@ -9464,7 +11030,7 @@ table.body h2 span {
@@ -9472,34 +11038,72 @@ table.body h2 span {
- This is a test post title + + + + + +
+ This is a test post title +
+ - - - - +
+ By Joe Bloggs • date - View in browser + + View in browser
- View in browser +
+ View in browser
+
+
+ 		 
+ + + + + + + + - - - - - +This is a test post title [http://127.0.0.1:2369/this-is-a-test-post-title-11/] -
  +
+ + + + + + +
+ - @@ -9508,63 +11112,133 @@ table.body h2 span { - + + + + + + + + + + + + + + +
+ -

Hello world

+

Hello world
+ + + + +
+ + \\"Comment\\" +

Comment

+ +
+
+

Subscription details

+

+ You are receiving this because you are a complimentary subscriber to Ghost. +

+ + + + + +
+

Name: not provided

+

Email: subscription-box-comped@example.com

+

Member since: date

+ 		+ Manage subscription +
+
+ + + + + + + + +
Ghost © 2026 – Unsubscribe
\\"Powered
+
+ + + 		 
+ + +", + "plaintext": " + + + + + + + + + + + +  + + + + + + + + + + + + + + + +http://127.0.0.1:2369/ + + + + + + + + + +Ghost [http://127.0.0.1:2369/] + + +Daily newsletter [http://127.0.0.1:2369/] + + + + + + + + -
-

Subscription details

-

- You are receiving this because you are a complimentary subscriber to Ghost. -

- - - - - -
-

Name: not provided

-

Email: subscription-box-comped@example.com

-

Member since: date

- 		- Manage subscription → -
-
- - - - - - - -
Ghost © 2025 – Unsubscribe
\\"Powered
-
- -
- 		 
- - -", - "plaintext": " @@ -9572,16 +11246,18 @@ table.body h2 span { -  +By Joe Bloggs • date +View in browser [http://127.0.0.1:2369/this-is-a-test-post-title-11/] +View in browser [http://127.0.0.1:2369/this-is-a-test-post-title-11/] @@ -9590,31 +11266,30 @@ table.body h2 span { -http://127.0.0.1:2369/ +  + -Ghost [http://127.0.0.1:2369/] -Daily newsletter [http://127.0.0.1:2369/] +  -This is a test post title [http://127.0.0.1:2369/this-is-a-test-post-title-9/] @@ -9624,15 +11299,13 @@ This is a test post title [http://127.0.0.1:2369/this-is-a-test-post-title-9/] -By Joe Bloggs • date +Hello world -View in browser [http://127.0.0.1:2369/this-is-a-test-post-title-9/] -View in browser [http://127.0.0.1:2369/this-is-a-test-post-title-9/] @@ -9644,12 +11317,14 @@ View in browser [http://127.0.0.1:2369/this-is-a-test-post-title-9/] -Hello world + +Comment +[http://127.0.0.1:2369/this-is-a-test-post-title-11/#ghost-comments-root] @@ -9686,7 +11361,7 @@ Member since: date -Manage subscription → [http://127.0.0.1:2369/#/portal/account] +Manage subscription [http://127.0.0.1:2369/#/portal/account] @@ -9699,7 +11374,7 @@ Manage subscription → [http://127.0.0.1:2369/#/portal/account] -Ghost © 2025 – Unsubscribe [unsubscribe_url] +Ghost © 2026 – Unsubscribe [unsubscribe_url] @@ -9714,32 +11389,280 @@ https://ghost.org/?via=pbg-newsletter -   -", +", +} +`; + +exports[`Batch sending tests Newsletter settings Shows subscription details box for free members 1 1`] = ` +Object { + "html": " + + + + + + This is a test post title + + - + Hello world - - - - - - + + + +
  -
- - - - + +
+  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­   +
+ + +
+ + + + + + +
  +
+ + - - - +
+ - +
@@ -10250,7 +11984,7 @@ table.body h2 span {
@@ -10258,34 +11992,72 @@ table.body h2 span {
- This is a test post title + + + + + +
+ This is a test post title +
+ - - - - +
+ By Joe Bloggs • date - View in browser + + View in browser
- View in browser +
+ View in browser
+
+
+ 		 
+ + + + + + + + @@ -10358,11 +12143,13 @@ table.body h2 span { -  +  + + @@ -10400,7 +12187,13 @@ Daily newsletter [http://127.0.0.1:2369/] -This is a test post title [http://127.0.0.1:2369/this-is-a-test-post-title-8/] + + + +This is a test post title [http://127.0.0.1:2369/this-is-a-test-post-title-10/] + + + @@ -10413,12 +12206,42 @@ This is a test post title [http://127.0.0.1:2369/this-is-a-test-post-title-8/] By Joe Bloggs • date -View in browser [http://127.0.0.1:2369/this-is-a-test-post-title-8/] +View in browser [http://127.0.0.1:2369/this-is-a-test-post-title-10/] + + + + +View in browser [http://127.0.0.1:2369/this-is-a-test-post-title-10/] + + + + + -View in browser [http://127.0.0.1:2369/this-is-a-test-post-title-8/] + + + + + +  + + + + + + + + + + + +  + + + @@ -10448,6 +12271,26 @@ Hello world + + + + +Comment + + +[http://127.0.0.1:2369/this-is-a-test-post-title-10/#ghost-comments-root] + + + + + + + + + + + + Subscription details @@ -10472,60 +12315,308 @@ Member since: date -Manage subscription → [http://127.0.0.1:2369/#/portal/account] +Manage subscription [http://127.0.0.1:2369/#/portal/account] + + + + + + + + + + + + +Ghost © 2026 – Unsubscribe [unsubscribe_url] + + + +https://ghost.org/?via=pbg-newsletter + + + + + + + + +  + + + + +", +} +`; + +exports[`Batch sending tests Newsletter settings Shows subscription details box for paid member 1 1`] = ` +Object { + "html": " + + + + + + This is a test post title + + - + Hello world -
  +
+ +
+ - @@ -10296,23 +12068,37 @@ table.body h2 span { + + + - -
+ -

Hello world

+

Hello world

+ + + + +
+ + \\"Comment\\" +

Comment

+ +
+
-

Subscription details

-

+

Subscription details

+

You are receiving this because you are a free subscriber to Ghost.

-
-

Name: not provided

-

Email: subscription-box-1@example.com

-

Member since: date

+

Name: not provided

+

Email: subscription-box-1@example.com

+

Member since: date

 - Manage subscription → + + Manage subscription
@@ -10323,7 +12109,7 @@ table.body h2 span { 		- + @@ -10332,8 +12118,7 @@ table.body h2 span {
Ghost © 2025 – UnsubscribeGhost © 2026 – Unsubscribe
+
- - - - - + + + +
  -
- - - - + +
+  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­   +
+ + +
+ + + + + + +
  +
+ + - - - +
+ - +
@@ -11036,7 +12938,7 @@ table.body h2 span {
@@ -11044,34 +12946,72 @@ table.body h2 span {
- This is a test post title + + + + + +
+ This is a test post title +
+ - - - - +
+ By Joe Bloggs • date - View in browser + + View in browser
- View in browser +
+ View in browser
+
+
+ 		 
+ + + + + + + +
  +
+ + + + + + +
+ - @@ -11082,23 +13022,37 @@ table.body h2 span { + + + +
+ -

Hello world

+

Hello world

+ + + + +
+ + \\"Comment\\" +

Comment

+ +
+
-

Subscription details

-

+

Subscription details

+

You are receiving this because you are a paid subscriber to Ghost. Your subscription will renew on date.

-
-

Name: not provided

-

Email: paid@example.com

-

Member since: date

+

Name: not provided

+

Email: paid@example.com

+

Member since: date

 - Manage subscription → + + Manage subscription
@@ -11109,7 +13063,7 @@ table.body h2 span { 		- + @@ -11118,25 +13072,80 @@ table.body h2 span {
Ghost © 2025 – UnsubscribeGhost © 2026 – Unsubscribe
+ + + 		 
+ + +", + "plaintext": " + + + + + + + + + + + +  + + + + + + + + + + + + + + + +http://127.0.0.1:2369/ + + + + + + + + + +Ghost [http://127.0.0.1:2369/] + + +Daily newsletter [http://127.0.0.1:2369/] + + + + + + + + + + + + -
- -
- 		 
- - -", - "plaintext": " @@ -11144,17 +13153,19 @@ table.body h2 span { -  +By Joe Bloggs • date +View in browser [http://127.0.0.1:2369/this-is-a-test-post-title-13/] +View in browser [http://127.0.0.1:2369/this-is-a-test-post-title-13/] @@ -11162,7 +13173,6 @@ table.body h2 span { -http://127.0.0.1:2369/ @@ -11170,23 +13180,23 @@ http://127.0.0.1:2369/ +  + -Ghost [http://127.0.0.1:2369/] -Daily newsletter [http://127.0.0.1:2369/] +  -This is a test post title [http://127.0.0.1:2369/this-is-a-test-post-title-11/] @@ -11196,15 +13206,14 @@ This is a test post title [http://127.0.0.1:2369/this-is-a-test-post-title-11/] -By Joe Bloggs • date + +Hello world -View in browser [http://127.0.0.1:2369/this-is-a-test-post-title-11/] -View in browser [http://127.0.0.1:2369/this-is-a-test-post-title-11/] @@ -11216,12 +13225,14 @@ View in browser [http://127.0.0.1:2369/this-is-a-test-post-title-11/] -Hello world + +Comment +[http://127.0.0.1:2369/this-is-a-test-post-title-13/#ghost-comments-root] @@ -11258,7 +13269,7 @@ Member since: date -Manage subscription → [http://127.0.0.1:2369/#/portal/account] +Manage subscription [http://127.0.0.1:2369/#/portal/account] @@ -11271,7 +13282,7 @@ Manage subscription → [http://127.0.0.1:2369/#/portal/account] -Ghost © 2025 – Unsubscribe [unsubscribe_url] +Ghost © 2026 – Unsubscribe [unsubscribe_url] @@ -11286,7 +13297,6 @@ https://ghost.org/?via=pbg-newsletter -   @@ -11299,28 +13309,126 @@ https://ghost.org/?via=pbg-newsletter exports[`Batch sending tests Newsletter settings Shows subscription details box for trialing member 1 1`] = ` Object { "html": " - + This is a test post title + - + Hello world - - - - - - + + + +
  -
- - - - + +
+  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­   +
+ + +
+ + + + + + +
  +
+ + - - - +
+ - +
@@ -11822,7 +13892,7 @@ table.body h2 span {
@@ -11830,34 +13900,72 @@ table.body h2 span {
- This is a test post title + + + + + +
+ This is a test post title +
+ - - - - +
+ By Joe Bloggs • date - View in browser + + View in browser
- View in browser +
+ View in browser
+
+
+ 		 
+ + + + + + + + @@ -11930,11 +14051,13 @@ table.body h2 span { -  +  + + @@ -11972,7 +14095,13 @@ Daily newsletter [http://127.0.0.1:2369/] -This is a test post title [http://127.0.0.1:2369/this-is-a-test-post-title-10/] + + + +This is a test post title [http://127.0.0.1:2369/this-is-a-test-post-title-12/] + + + @@ -11985,12 +14114,42 @@ This is a test post title [http://127.0.0.1:2369/this-is-a-test-post-title-10/] By Joe Bloggs • date -View in browser [http://127.0.0.1:2369/this-is-a-test-post-title-10/] +View in browser [http://127.0.0.1:2369/this-is-a-test-post-title-12/] -View in browser [http://127.0.0.1:2369/this-is-a-test-post-title-10/] +View in browser [http://127.0.0.1:2369/this-is-a-test-post-title-12/] + + + + + + + + + + + + + + +  + + + + + + + + + + + +  + + + @@ -12020,6 +14179,26 @@ Hello world + + + + +Comment + + +[http://127.0.0.1:2369/this-is-a-test-post-title-12/#ghost-comments-root] + + + + + + + + + + + + Subscription details @@ -12044,7 +14223,7 @@ Member since: date -Manage subscription → [http://127.0.0.1:2369/#/portal/account] +Manage subscription [http://127.0.0.1:2369/#/portal/account] @@ -12057,7 +14236,7 @@ Manage subscription → [http://127.0.0.1:2369/#/portal/account] -Ghost © 2025 – Unsubscribe [unsubscribe_url] +Ghost © 2026 – Unsubscribe [unsubscribe_url] @@ -12072,32 +14251,280 @@ https://ghost.org/?via=pbg-newsletter +  + + + + +", +} +`; + +exports[`Batch sending tests Replacements Does replace with and without fallback in both plaintext and html for member with name 1 1`] = ` +Object { + "html": " + + + + + + A random test post + + - + Hello {first_name}, -
  +
+ +
+ - @@ -11868,23 +13976,37 @@ table.body h2 span { + + + - -
+ -

Hello world

+

Hello world

+ + + + +
+ + \\"Comment\\" +

Comment

+ +
+
-

Subscription details

-

+

Subscription details

+

You are receiving this because you are a trialing subscriber to Ghost. Your free trial ends on date, at which time you will be charged the regular price. You can always cancel before then.

-
-

Name: not provided

-

Email: trialing-paid@example.com

-

Member since: date

+

Name: not provided

+

Email: trialing-paid@example.com

+

Member since: date

 - Manage subscription → + + Manage subscription
@@ -11895,7 +14017,7 @@ table.body h2 span { 		- + @@ -11904,8 +14026,7 @@ table.body h2 span {
Ghost © 2025 – UnsubscribeGhost © 2026 – Unsubscribe
+
- - - - - + + + +
  -
- - - - + +
+  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­   +
+ + +
+ + + + + + +
  +
+ + - - - +
+ - +
@@ -12608,7 +14846,7 @@ table.body h2 span {
@@ -12616,34 +14854,72 @@ table.body h2 span {
- A random test post + + + + + +
+ A random test post +
+ - - - - +
+ By Joe Bloggs • date - View in browser + + View in browser
- View in browser +
+ View in browser
+
+
+ 		 
+ + + + + + + + @@ -12696,11 +14985,13 @@ table.body h2 span { -  +  + + @@ -12738,6 +15029,9 @@ Daily newsletter [http://127.0.0.1:2369/r/xxxxxx?m=member-uuid] + + + A random test post [http://127.0.0.1:2369/r/xxxxxx?m=member-uuid] @@ -12748,6 +15042,9 @@ A random test post [http://127.0.0.1:2369/r/xxxxxx?m=member-uuid] + + + By Joe Bloggs • date @@ -12768,6 +15065,36 @@ View in browser [http://127.0.0.1:2369/r/xxxxxx?m=member-uuid] + + + +  + + + + + + + + + + + +  + + + + + + + + + + + + + + Hello {first_name}, Hey Simon, Hey Simon, @@ -12790,47 +15117,315 @@ Hey Simon, Hey Simon, -Ghost © 2025 – Unsubscribe [http://127.0.0.1:2369/unsubscribe/?uuid=member-uuid&key=xxxxxx&newsletter=requested-newsletter-uuid] +Comment + + +[http://127.0.0.1:2369/r/xxxxxx?m=member-uuid] + + + + + + + + + + + + + + +Ghost © 2026 – Unsubscribe [http://127.0.0.1:2369/unsubscribe/?uuid=member-uuid&key=xxxxxx&newsletter=requested-newsletter-uuid] + + + +https://ghost.org/?via=pbg-newsletter&ref=127.0.0.1 + + + + + + + + + + +  + + + + +", +} +`; + +exports[`Batch sending tests Replacements Does replace with and without fallback in both plaintext and html for member without name 1 1`] = ` +Object { + "html": " + + + + + + A random test post + + - + Hello {first_name}, -
  +
+ +
+ - @@ -12654,6 +14930,20 @@ table.body h2 span { + + + @@ -12661,7 +14951,7 @@ table.body h2 span { - -
+ -

Hello {first_name},

Hey Simon, Hey Simon,

+

Hello {first_name},

Hey Simon, Hey Simon,

+ + + + +
+ + \\"Comment\\" +

Comment

+ +
+
- + @@ -12670,8 +14960,7 @@ table.body h2 span {
Ghost © 2025 – UnsubscribeGhost © 2026 – Unsubscribe
+
- - - - - + + + +
  -
- - - - + +
+  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏  ͏ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­ ­   +
+ + +
+ + + + + + +
  +
+ + - - - +
+ - +
@@ -13341,7 +15747,7 @@ table.body h2 span {
@@ -13349,34 +15755,72 @@ table.body h2 span {
- A random test post + + + + + +
+ A random test post +
+ - - - - +
+ By Joe Bloggs • date - View in browser + + View in browser
- View in browser +
+ View in browser
+
+
+ 		 
+ + + + + + + + @@ -13429,11 +15886,13 @@ table.body h2 span { -  +  + + @@ -13471,6 +15930,9 @@ Daily newsletter [http://127.0.0.1:2369/r/xxxxxx?m=member-uuid] + + + A random test post [http://127.0.0.1:2369/r/xxxxxx?m=member-uuid] @@ -13481,6 +15943,9 @@ A random test post [http://127.0.0.1:2369/r/xxxxxx?m=member-uuid] + + + By Joe Bloggs • date @@ -13501,6 +15966,36 @@ View in browser [http://127.0.0.1:2369/r/xxxxxx?m=member-uuid] + + + +  + + + + + + + + + + + +  + + + + + + + + + + + + + + Hello {first_name}, Hey there, Hey , @@ -13523,11 +16018,13 @@ Hey there, Hey , -Ghost © 2025 – Unsubscribe [http://127.0.0.1:2369/unsubscribe/?uuid=member-uuid&key=xxxxxx&newsletter=requested-newsletter-uuid] +Comment + + +[http://127.0.0.1:2369/r/xxxxxx?m=member-uuid] -https://ghost.org/?via=pbg-newsletter&ref=127.0.0.1 @@ -13539,6 +16036,23 @@ https://ghost.org/?via=pbg-newsletter&ref=127.0.0.1 + + +Ghost © 2026 – Unsubscribe [http://127.0.0.1:2369/unsubscribe/?uuid=member-uuid&key=xxxxxx&newsletter=requested-newsletter-uuid] + + + +https://ghost.org/?via=pbg-newsletter&ref=127.0.0.1 + + + + + + + + + +   diff --git a/ghost/core/test/integration/services/email-service/batch-sending.test.js b/ghost/core/test/integration/services/email-service/batch-sending.test.js index 783a09eebb6..e3f095394d5 100644 --- a/ghost/core/test/integration/services/email-service/batch-sending.test.js +++ b/ghost/core/test/integration/services/email-service/batch-sending.test.js @@ -85,10 +85,7 @@ async function testEmailBatches(settings, email_recipient_filter, expectedBatche assert.equal(memberIds.length, _.uniq(memberIds).length); } -// The batch sending tests have some sort of ordering issue that causes them to fail intermittently -// We need to decide if they are worth keeping, or if we should rewrite them to be more reliable -// eslint-disable-next-line ghost/mocha/no-skipped-tests -describe.skip('Batch sending tests', function () { +describe('Batch sending tests', function () { let linkRedirectService, linkRedirectRepository, linkTrackingService, linkClickRepository; let ghostServer; @@ -713,12 +710,12 @@ describe.skip('Batch sending tests', function () { assert.match(html, /Hey there, Hey ,/); // The unsubscribe link is replaced - assert.match(html, / Date: Mon, 22 Jun 2026 13:46:57 -0500 Subject: [PATCH 2/3] Fixed email snapshots breaking at the year boundary MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit no ref The email footer renders the copyright year live (email-renderer.js uses new Date().getFullYear()), and matchEmailSnapshot scrubbed the unsubscribe URL, redirect links, keys and uuids but not the year — so the regenerated snapshots would fail on the next January 1. Added a year scrub to the shared matcher (the current year, resolved from the same process clock the renderer uses, so it always matches what was rendered) and regenerated the batch-sending and cards snapshots. Fixed copyright years in content (e.g. 2024) are left intact. --- .../__snapshots__/batch-sending.test.js.snap | 32 +++++++++---------- .../__snapshots__/cards.test.js.snap | 8 ++--- ghost/core/test/utils/batch-email-utils.js | 6 ++++ 3 files changed, 26 insertions(+), 20 deletions(-) diff --git a/ghost/core/test/integration/services/email-service/__snapshots__/batch-sending.test.js.snap b/ghost/core/test/integration/services/email-service/__snapshots__/batch-sending.test.js.snap index 0b9d0fbbe84..900caed215b 100644 --- a/ghost/core/test/integration/services/email-service/__snapshots__/batch-sending.test.js.snap +++ b/ghost/core/test/integration/services/email-service/__snapshots__/batch-sending.test.js.snap @@ -899,7 +899,7 @@ Comment -Ghost © 2026 – Unsubscribe [http://127.0.0.1:2369/unsubscribe/?uuid=member-uuid&key=xxxxxx&newsletter=requested-newsletter-uuid] +Ghost © YYYY – Unsubscribe [http://127.0.0.1:2369/unsubscribe/?uuid=member-uuid&key=xxxxxx&newsletter=requested-newsletter-uuid] @@ -1764,7 +1764,7 @@ Hello world -Ghost © 2026 – Unsubscribe [unsubscribe_url] +Ghost © YYYY – Unsubscribe [unsubscribe_url] @@ -2629,7 +2629,7 @@ Hello world -Ghost © 2026 – Unsubscribe [unsubscribe_url] +Ghost © YYYY – Unsubscribe [unsubscribe_url] @@ -3494,7 +3494,7 @@ Hello world -Ghost © 2026 – Unsubscribe [unsubscribe_url] +Ghost © YYYY – Unsubscribe [unsubscribe_url] @@ -4329,7 +4329,7 @@ Comment -Ghost © 2026 – Unsubscribe [http://127.0.0.1:2369/unsubscribe/?uuid=member-uuid&key=xxxxxx&newsletter=requested-newsletter-uuid] +Ghost © YYYY – Unsubscribe [http://127.0.0.1:2369/unsubscribe/?uuid=member-uuid&key=xxxxxx&newsletter=requested-newsletter-uuid] @@ -5228,7 +5228,7 @@ Comment -Ghost © 2026 – Unsubscribe [http://127.0.0.1:2369/unsubscribe/?uuid=member-uuid&key=xxxxxx&newsletter=requested-newsletter-uuid] +Ghost © YYYY – Unsubscribe [http://127.0.0.1:2369/unsubscribe/?uuid=member-uuid&key=xxxxxx&newsletter=requested-newsletter-uuid] @@ -6159,7 +6159,7 @@ Comment -Ghost © 2026 – Unsubscribe [http://127.0.0.1:2369/unsubscribe/?uuid=member-uuid&key=xxxxxx&newsletter=requested-newsletter-uuid] +Ghost © YYYY – Unsubscribe [http://127.0.0.1:2369/unsubscribe/?uuid=member-uuid&key=xxxxxx&newsletter=requested-newsletter-uuid] @@ -7058,7 +7058,7 @@ Comment -Ghost © 2026 – Unsubscribe [unsubscribe_url] +Ghost © YYYY – Unsubscribe [unsubscribe_url] @@ -9466,7 +9466,7 @@ Hello world [http://127.0.0.1:2369/r/xxxxxx?m=member-uuid] -Ghost © 2026 – Unsubscribe [http://127.0.0.1:2369/unsubscribe/?uuid=member-uuid&key=xxxxxx&newsletter=requested-newsletter-uuid] +Ghost © YYYY – Unsubscribe [http://127.0.0.1:2369/unsubscribe/?uuid=member-uuid&key=xxxxxx&newsletter=requested-newsletter-uuid] @@ -10420,7 +10420,7 @@ Manage subscription [http://127.0.0.1:2369/#/portal/account] -Ghost © 2026 – Unsubscribe [unsubscribe_url] +Ghost © YYYY – Unsubscribe [unsubscribe_url] @@ -11374,7 +11374,7 @@ Manage subscription [http://127.0.0.1:2369/#/portal/account] -Ghost © 2026 – Unsubscribe [unsubscribe_url] +Ghost © YYYY – Unsubscribe [unsubscribe_url] @@ -12328,7 +12328,7 @@ Manage subscription [http://127.0.0.1:2369/#/portal/account] -Ghost © 2026 – Unsubscribe [unsubscribe_url] +Ghost © YYYY – Unsubscribe [unsubscribe_url] @@ -13282,7 +13282,7 @@ Manage subscription [http://127.0.0.1:2369/#/portal/account] -Ghost © 2026 – Unsubscribe [unsubscribe_url] +Ghost © YYYY – Unsubscribe [unsubscribe_url] @@ -14236,7 +14236,7 @@ Manage subscription [http://127.0.0.1:2369/#/portal/account] -Ghost © 2026 – Unsubscribe [unsubscribe_url] +Ghost © YYYY – Unsubscribe [unsubscribe_url] @@ -15137,7 +15137,7 @@ Comment -Ghost © 2026 – Unsubscribe [http://127.0.0.1:2369/unsubscribe/?uuid=member-uuid&key=xxxxxx&newsletter=requested-newsletter-uuid] +Ghost © YYYY – Unsubscribe [http://127.0.0.1:2369/unsubscribe/?uuid=member-uuid&key=xxxxxx&newsletter=requested-newsletter-uuid] @@ -16038,7 +16038,7 @@ Comment -Ghost © 2026 – Unsubscribe [http://127.0.0.1:2369/unsubscribe/?uuid=member-uuid&key=xxxxxx&newsletter=requested-newsletter-uuid] +Ghost © YYYY – Unsubscribe [http://127.0.0.1:2369/unsubscribe/?uuid=member-uuid&key=xxxxxx&newsletter=requested-newsletter-uuid] diff --git a/ghost/core/test/integration/services/email-service/__snapshots__/cards.test.js.snap b/ghost/core/test/integration/services/email-service/__snapshots__/cards.test.js.snap index 147b9390446..2bc8718cfe6 100644 --- a/ghost/core/test/integration/services/email-service/__snapshots__/cards.test.js.snap +++ b/ghost/core/test/integration/services/email-service/__snapshots__/cards.test.js.snap @@ -875,7 +875,7 @@ Comment -Ghost © 2025 – Unsubscribe [http://127.0.0.1:2369/unsubscribe/?uuid=member-uuid&key=xxxxxx&newsletter=requested-newsletter-uuid] +Ghost © YYYY – Unsubscribe [http://127.0.0.1:2369/unsubscribe/?uuid=member-uuid&key=xxxxxx&newsletter=requested-newsletter-uuid] @@ -1774,7 +1774,7 @@ Comment -Ghost © 2025 – Unsubscribe [http://127.0.0.1:2369/unsubscribe/?uuid=member-uuid&key=xxxxxx&newsletter=requested-newsletter-uuid] +Ghost © YYYY – Unsubscribe [http://127.0.0.1:2369/unsubscribe/?uuid=member-uuid&key=xxxxxx&newsletter=requested-newsletter-uuid] @@ -9135,7 +9135,7 @@ Comment -Ghost © 2025 – Unsubscribe [http://127.0.0.1:2369/unsubscribe/?uuid=member-uuid&key=xxxxxx&newsletter=requested-newsletter-uuid] +Ghost © YYYY – Unsubscribe [http://127.0.0.1:2369/unsubscribe/?uuid=member-uuid&key=xxxxxx&newsletter=requested-newsletter-uuid] @@ -10720,7 +10720,7 @@ Comment -Ghost © 2025 – Unsubscribe [http://127.0.0.1:2369/unsubscribe/?uuid=member-uuid&key=xxxxxx&newsletter=requested-newsletter-uuid] +Ghost © YYYY – Unsubscribe [http://127.0.0.1:2369/unsubscribe/?uuid=member-uuid&key=xxxxxx&newsletter=requested-newsletter-uuid] diff --git a/ghost/core/test/utils/batch-email-utils.js b/ghost/core/test/utils/batch-email-utils.js index 71aa6c23739..4b290ebef21 100644 --- a/ghost/core/test/utils/batch-email-utils.js +++ b/ghost/core/test/utils/batch-email-utils.js @@ -166,6 +166,12 @@ async function matchEmailSnapshot() { match: /\d{1,2}\s\w+\s\d{4}/g, replacement: 'date' }, + { + // Footer year is rendered live (new Date().getFullYear()); normalise + // it so snapshots don't rot at every year boundary. + match: new RegExp(`©\\s*${new Date().getFullYear()}`, 'g'), + replacement: '© YYYY' + }, { match: defaultNewsletter.get('uuid'), replacement: 'requested-newsletter-uuid' From 2456635da961abbfdb143807651bf777413bc2e8 Mon Sep 17 00:00:00 2001 From: Steve Larson <9larsons@gmail.com> Date: Mon, 22 Jun 2026 14:20:23 -0500 Subject: [PATCH 3/3] Fixed batch-sending member leakage that cascaded on mysql MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit no ref The suite seeds members once in beforeAll and several tests add more, cleaning up inline. When a test threw before its inline cleanup — e.g. the timing- sensitive "submitted" assertion in the first member-creating test, which fails on mysql — the leaked subscriber shifted every later test's recipient count, turning one failure into eleven. Snapshot the seeded member ids in beforeEach and drop any extras in afterEach so a single failure can't poison the rest, and removed the now-stale FLAKEY markers. Verified 4x on mysql and 2x on sqlite, 42/42 each. --- .../email-service/batch-sending.test.js | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/ghost/core/test/integration/services/email-service/batch-sending.test.js b/ghost/core/test/integration/services/email-service/batch-sending.test.js index e3f095394d5..3a24b99f577 100644 --- a/ghost/core/test/integration/services/email-service/batch-sending.test.js +++ b/ghost/core/test/integration/services/email-service/batch-sending.test.js @@ -88,8 +88,9 @@ async function testEmailBatches(settings, email_recipient_filter, expectedBatche describe('Batch sending tests', function () { let linkRedirectService, linkRedirectRepository, linkTrackingService, linkClickRepository; let ghostServer; + let seededMemberIds; - beforeEach(function () { + beforeEach(async function () { configUtils.set('bulkEmail:batchSize', 100); stubbedSend = sinon.fake.resolves({ id: 'stubbed-email-id' @@ -100,6 +101,11 @@ describe('Batch sending tests', function () { return stubbedSend.call(this, ...arguments); }); mockManager.mockStripe(); + + // Snapshot the seeded members so afterEach can drop any a test creates, + // keeping recipient counts deterministic even if a test throws before + // its own cleanup runs. + seededMemberIds = new Set((await models.Member.findAll()).models.map(member => member.id)); }); afterEach(async function () { @@ -110,6 +116,13 @@ describe('Batch sending tests', function () { }], {context: {internal: true}}); mockManager.restore(); await jobManager.allSettled(); + + // Drop any members a test created so they don't leak into later tests — + // a leaked subscriber shifts recipient counts and cascades failures. + const leaked = (await models.Member.findAll()).models.filter(member => !seededMemberIds.has(member.id)); + for (const member of leaked) { + await models.Member.destroy({id: member.id}); + } }); beforeAll(async function () { @@ -193,7 +206,6 @@ describe('Batch sending tests', function () { assert.equal(batches.models.length, 1); }); - // FLAKEY it('Doesn\'t include members created after the email in the batches', async function () { // If we create a new member (e.g. a member that was imported) after the email was created, they should not be included in the email const addStub = sinon.stub(models.Email, 'add'); @@ -246,7 +258,6 @@ describe('Batch sending tests', function () { await models.Member.destroy({id: laterMember.id}); }); - // FLAKEY it('Splits recipients in free and paid batch', async function () { await testEmailBatches({ // Requires a paywall = different content for paid and free members @@ -551,7 +562,6 @@ describe('Batch sending tests', function () { await restoreEmailVerificationUtils(); }); - // FLAKEY describe('Target Delivery Window', function () { it('can send an email with a target delivery window set', async function () { const t0 = new Date();
  +
+ +
+ - @@ -13387,6 +15831,20 @@ table.body h2 span { + + + @@ -13394,7 +15852,7 @@ table.body h2 span { - -
+ -

Hello {first_name},

Hey there, Hey ,

+

Hello {first_name},

Hey there, Hey ,

+ + + + +
+ + \\"Comment\\" +

Comment

+ +
+
- + @@ -13403,8 +15861,7 @@ table.body h2 span {
Ghost © 2025 – UnsubscribeGhost © 2026 – Unsubscribe
+