From 32d888d3cc3c9fee02bc9e559e044d010e26c47e Mon Sep 17 00:00:00 2001 From: Naz Date: Wed, 11 May 2022 10:10:45 +0800 Subject: [PATCH] Fixed email copy based on feedback refs https://github.com/TryGhost/Toolbox/issues/292 - The email copy had a few bits that were off after the review. This fixes them. --- .../lib/templates/generic-mismatch.html | 4 +-- .../api-version-compatibility-service.test.js | 26 +++++++++---------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/ghost/api-version-compatibility-service/lib/templates/generic-mismatch.html b/ghost/api-version-compatibility-service/lib/templates/generic-mismatch.html index d252623df6..fd8dbd9168 100644 --- a/ghost/api-version-compatibility-service/lib/templates/generic-mismatch.html +++ b/ghost/api-version-compatibility-service/lib/templates/generic-mismatch.html @@ -128,11 +128,11 @@ a {

- Ghost has noticed that your {{clientName}} is no longer working as expected. To resolve, this integration must be updated by its developer to work with the your version of Ghost. + Ghost has noticed that your {{clientName}} integration is no longer working as expected. To resolve, this integration must be updated by its developer to work with the your version of Ghost.

- To help you get things fixed as quickly as possible, Ghost has automatically generated some helpful information about the error that you can share with the creator of the Cove integration below: + To help you get things fixed as quickly as possible, Ghost has automatically generated some helpful information about the error that you can share with the creator of the {{clientName}} integration below:

diff --git a/ghost/api-version-compatibility-service/test/api-version-compatibility-service.test.js b/ghost/api-version-compatibility-service/test/api-version-compatibility-service.test.js index 99b8e6903f..6f673ea35a 100644 --- a/ghost/api-version-compatibility-service/test/api-version-compatibility-service.test.js +++ b/ghost/api-version-compatibility-service/test/api-version-compatibility-service.test.js @@ -78,7 +78,7 @@ describe('APIVersionCompatibilityService', function () { acceptVersion: 'v4.5', contentVersion: 'v5.1', userAgent: 'GhostAdminSDK/2.4.0', - requestURL: 'https://amazeballsghostsite.com/ghost/api/admin/posts/dew023d9203se4', + requestURL: '/ghost/api/admin/posts/dew023d9203se4', apiKeyValue: 'secret', apiKeyType: 'content' }); @@ -87,19 +87,19 @@ describe('APIVersionCompatibilityService', function () { assert.equal(sendEmail.args[0][0].to, 'simon@example.com'); assert.equal(sendEmail.args[0][0].subject, `Attention required: Your Elaborate Fox integration has failed`); - assert.match(sendEmail.args[0][0].html, /Ghost has noticed that your Elaborate Fox<\/strong> is no longer working as expected\./); + assert.match(sendEmail.args[0][0].html, /Ghost has noticed that your Elaborate Fox<\/strong> integration is no longer working as expected\./); assert.match(sendEmail.args[0][0].html, /Elaborate Fox integration expected Ghost version:<\/strong>  v4.5/); assert.match(sendEmail.args[0][0].html, /Current Ghost version:<\/strong>  v5.1/); - assert.match(sendEmail.args[0][0].html, /Failed request URL:<\/strong>  https:\/\/amazeballsghostsite.com\/ghost\/api\/admin\/posts\/dew023d9203se4/); + assert.match(sendEmail.args[0][0].html, /Failed request URL:<\/strong>  \/ghost\/api\/admin\/posts\/dew023d9203se4/); assert.match(sendEmail.args[0][0].html, /This email was sent from Elaborate Fox<\/strong> is no longer working as expected\./); + assert.match(sendEmail.args[0][0].html, /Ghost has noticed that your Elaborate Fox<\/strong> integration is no longer working as expected\./); assert.match(sendEmail.args[0][0].html, /Elaborate Fox integration expected Ghost version:<\/strong>  v4.5/); assert.match(sendEmail.args[0][0].html, /Current Ghost version:<\/strong>  v5.1/); assert.match(sendEmail.args[0][0].html, /Failed request URL:<\/strong>  https:\/\/amazeballsghostsite.com\/ghost\/api\/admin\/posts\/dew023d9203se4/); @@ -159,7 +159,7 @@ describe('APIVersionCompatibilityService', function () { assert.match(sendEmail.args[0][0].html, /This email was sent from Elaborate Fox<\/strong> is no longer working as expected\./); + assert.match(sendEmail.args[0][0].html, /Ghost has noticed that your Elaborate Fox<\/strong> integration is no longer working as expected\./); assert.match(sendEmail.args[0][0].html, /Elaborate Fox integration expected Ghost version:<\/strong>  v4.5/); assert.match(sendEmail.args[0][0].html, /Current Ghost version:<\/strong>  v5.1/); assert.match(sendEmail.args[0][0].html, /Failed request URL:<\/strong>  https:\/\/amazeballsghostsite.com\/ghost\/api\/admin\/posts\/dew023d9203se4/); @@ -265,7 +265,7 @@ describe('APIVersionCompatibilityService', function () { assert.match(sendEmail.args[0][0].html, /This email was sent from Elaborate Fox<\/strong> is no longer working as expected\./); + assert.match(sendEmail.args[1][0].html, /Ghost has noticed that your Elaborate Fox<\/strong> integration is no longer working as expected\./); assert.match(sendEmail.args[1][0].html, /Elaborate Fox integration expected Ghost version:<\/strong>  v4.5/); assert.match(sendEmail.args[1][0].html, /Current Ghost version:<\/strong>  v5.1/); assert.match(sendEmail.args[1][0].html, /Failed request URL:<\/strong>  https:\/\/amazeballsghostsite.com\/ghost\/api\/admin\/posts\/dew023d9203se4/); @@ -286,7 +286,7 @@ describe('APIVersionCompatibilityService', function () { assert.match(sendEmail.args[1][0].html, /This email was sent from Elaborate Fox<\/strong> is no longer working as expected\./); + assert.match(sendEmail.args[2][0].html, /Ghost has noticed that your Elaborate Fox<\/strong> integration is no longer working as expected\./); assert.match(sendEmail.args[2][0].html, /Elaborate Fox integration expected Ghost version:<\/strong>  v4.8/); assert.match(sendEmail.args[2][0].html, /Current Ghost version:<\/strong>  v5.1/); assert.match(sendEmail.args[2][0].html, /Failed request URL:<\/strong>  https:\/\/amazeballsghostsite.com\/ghost\/api\/admin\/posts\/dew023d9203se4/); - assert.match(sendEmail.args[2][0].text, /Ghost has noticed that your Elaborate Fox is no longer working as expected\./); + assert.match(sendEmail.args[2][0].text, /Ghost has noticed that your Elaborate Fox integration is no longer working/); assert.match(sendEmail.args[2][0].text, /Elaborate Fox integration expected Ghost version:v4.8/); assert.match(sendEmail.args[2][0].text, /Current Ghost version:v5.1/); assert.match(sendEmail.args[2][0].text, /Failed request URL:/);