From 90ef8f008ecdc1ed20e68734cab764998bd38748 Mon Sep 17 00:00:00 2001
From: Sam Lord <sam@ghost.org>
Date: Wed, 1 Mar 2023 16:36:47 +0000
Subject: [PATCH] Prevent error logs from occuring in Ghost unit test suite

refs: https://github.com/TryGhost/Toolbox/issues/389
---
 .../unit/frontend/helpers/cancel_link.test.js |  4 ++++
 .../test/unit/frontend/helpers/get.test.js    | 13 ++++++++----
 .../unit/frontend/helpers/next_post.test.js   |  3 +++
 .../unit/frontend/helpers/prev_post.test.js   |  3 +++
 .../test/unit/frontend/helpers/url.test.js    |  5 ++++-
 .../services/theme-engine/i18n.test.js        | 21 +++++++++++--------
 .../scheduling/SchedulingDefault.test.js      |  4 ++++
 .../post-scheduling/post-scheduler.test.js    | 11 ++++++++--
 .../unit/server/data/exporter/index.test.js   |  3 +++
 .../unit/server/data/importer/index.test.js   |  3 +++
 .../image/cached-image-size-from-url.test.js  |  3 +++
 .../test/unit/server/lib/mobiledoc.test.js    |  9 ++++++++
 .../frontend-data-service.test.js             |  5 +++++
 .../mega/post-email-serializer.test.js        |  9 ++++++--
 .../services/mentions/RoutingService.test.js  |  7 +++++++
 .../test/unit/server/services/slack.test.js   |  5 +++--
 .../server/services/themes/validate.test.js   |  8 ++++++-
 17 files changed, 95 insertions(+), 21 deletions(-)

diff --git a/ghost/core/test/unit/frontend/helpers/cancel_link.test.js b/ghost/core/test/unit/frontend/helpers/cancel_link.test.js
index 0594cad63e..9b44984d8d 100644
--- a/ghost/core/test/unit/frontend/helpers/cancel_link.test.js
+++ b/ghost/core/test/unit/frontend/helpers/cancel_link.test.js
@@ -4,6 +4,7 @@ const hbs = require('../../../../core/frontend/services/theme-engine/engine');
 const cancel_link = require('../../../../core/frontend/helpers/cancel_link');
 const labs = require('../../../../core/shared/labs');
 const configUtils = require('../../../utils/configUtils');
+const logging = require('@tryghost/logging');
 
 describe('{{cancel_link}} helper', function () {
     let labsStub;
@@ -126,6 +127,7 @@ describe('{{cancel_link}} helper', function () {
 
     it('is disabled if labs flag is not set', function () {
         labsStub.returns(false);
+        const loggingStub = sinon.stub(logging, 'error');
 
         const rendered = cancel_link.call({
             id: 'sub_continue',
@@ -136,5 +138,7 @@ describe('{{cancel_link}} helper', function () {
 
         rendered.string.should.match(/^<script/);
         rendered.string.should.match(/helper is not available/);
+
+        sinon.assert.calledOnce(loggingStub);
     });
 });
diff --git a/ghost/core/test/unit/frontend/helpers/get.test.js b/ghost/core/test/unit/frontend/helpers/get.test.js
index f7f53a852c..3893d67d37 100644
--- a/ghost/core/test/unit/frontend/helpers/get.test.js
+++ b/ghost/core/test/unit/frontend/helpers/get.test.js
@@ -2,7 +2,7 @@ const should = require('should');
 const sinon = require('sinon');
 const {SafeString} = require('../../../../core/frontend/services/handlebars');
 const configUtils = require('../../../utils/configUtils');
-const logging = require('@tryghost/logging');
+const loggingLib = require('@tryghost/logging');
 
 // Stuff we are testing
 const get = require('../../../../core/frontend/helpers/get');
@@ -14,6 +14,7 @@ describe('{{#get}} helper', function () {
     let fn;
     let inverse;
     let locals = {};
+    let logging;
 
     before(function () {
         models.init();
@@ -24,6 +25,13 @@ describe('{{#get}} helper', function () {
         inverse = sinon.spy();
 
         locals = {root: {}, globalProp: {foo: 'bar'}};
+
+        // We're testing how the browse stub is called, not the response.
+        // Each get call errors since the posts resource is not populated.
+        logging = {
+            error: sinon.stub(loggingLib, 'error'),
+            warn: sinon.stub(loggingLib, 'warn')
+        };
     });
 
     afterEach(function () {
@@ -323,9 +331,6 @@ describe('{{#get}} helper', function () {
 
     describe('optimization', function () {
         beforeEach(function () {
-            sinon.spy(logging, 'error');
-            sinon.spy(logging, 'warn');
-
             sinon.stub(api, 'postsPublic').get(() => {
                 return {
                     browse: () => {
diff --git a/ghost/core/test/unit/frontend/helpers/next_post.test.js b/ghost/core/test/unit/frontend/helpers/next_post.test.js
index 2b978717c2..ffe006c156 100644
--- a/ghost/core/test/unit/frontend/helpers/next_post.test.js
+++ b/ghost/core/test/unit/frontend/helpers/next_post.test.js
@@ -4,6 +4,7 @@ const markdownToMobiledoc = require('../../../utils/fixtures/data-generator').ma
 const next_post = require('../../../../core/frontend/helpers/prev_post');
 const api = require('../../../../core/frontend/services/proxy').api;
 const should = require('should');
+const logging = require('@tryghost/logging');
 
 describe('{{next_post}} helper', function () {
     let locals;
@@ -356,6 +357,7 @@ describe('{{next_post}} helper', function () {
             const fn = sinon.spy();
             const inverse = sinon.spy();
             const optionsData = {name: 'next_post', data: locals, fn: fn, inverse: inverse};
+            const loggingStub = sinon.stub(logging, 'error');
 
             await next_post
                 .call({
@@ -370,6 +372,7 @@ describe('{{next_post}} helper', function () {
 
             fn.called.should.be.false();
             inverse.calledOnce.should.be.true();
+            loggingStub.calledOnce.should.be.true();
 
             inverse.firstCall.args[1].should.be.an.Object().and.have.property('data');
             inverse.firstCall.args[1].data.should.be.an.Object().and.have.property('error');
diff --git a/ghost/core/test/unit/frontend/helpers/prev_post.test.js b/ghost/core/test/unit/frontend/helpers/prev_post.test.js
index c80d717ccc..42b9ae985a 100644
--- a/ghost/core/test/unit/frontend/helpers/prev_post.test.js
+++ b/ghost/core/test/unit/frontend/helpers/prev_post.test.js
@@ -4,6 +4,7 @@ const markdownToMobiledoc = require('../../../utils/fixtures/data-generator').ma
 const prev_post = require('../../../../core/frontend/helpers/prev_post');
 const api = require('../../../../core/frontend/services/proxy').api;
 const should = require('should');
+const logging = require('@tryghost/logging');
 
 describe('{{prev_post}} helper', function () {
     let browsePostsStub;
@@ -360,6 +361,7 @@ describe('{{prev_post}} helper', function () {
             const fn = sinon.spy();
             const inverse = sinon.spy();
             const optionsData = {name: 'prev_post', data: locals, fn: fn, inverse: inverse};
+            const loggingStub = sinon.stub(logging, 'error');
 
             await prev_post
                 .call({
@@ -374,6 +376,7 @@ describe('{{prev_post}} helper', function () {
 
             fn.called.should.be.false();
             inverse.calledOnce.should.be.true();
+            loggingStub.calledOnce.should.be.true();
 
             inverse.firstCall.args[1].should.be.an.Object().and.have.property('data');
             inverse.firstCall.args[1].data.should.be.an.Object().and.have.property('error');
diff --git a/ghost/core/test/unit/frontend/helpers/url.test.js b/ghost/core/test/unit/frontend/helpers/url.test.js
index 2eda03cef0..41a3468d94 100644
--- a/ghost/core/test/unit/frontend/helpers/url.test.js
+++ b/ghost/core/test/unit/frontend/helpers/url.test.js
@@ -6,6 +6,7 @@ const configUtils = require('../../../utils/configUtils');
 const markdownToMobiledoc = require('../../../utils/fixtures/data-generator').markdownToMobiledoc;
 const url = require('../../../../core/frontend/helpers/url');
 const urlService = require('../../../../core/server/services/url');
+const logging = require('@tryghost/logging');
 const api = require('../../../../core/server/api').endpoints;
 
 describe('{{url}} helper', function () {
@@ -219,10 +220,12 @@ describe('{{url}} helper', function () {
             rendered.string.should.equal('/?foo=space%20bar');
         });
 
-        it('should an empty string when we can\'t parse a string', function () {
+        it('should return an empty string when we can\'t parse a string', function () {
+            const loggingStub = sinon.stub(logging, 'error');
             rendered = url.call({url: '/?foo=space%%bar', label: 'Baz', slug: 'baz', current: true});
             should.exist(rendered);
             rendered.string.should.equal('');
+            sinon.assert.calledOnce(loggingStub);
         });
 
         it('should not encode square brackets (as in valid IPV6 addresses)', function () {
diff --git a/ghost/core/test/unit/frontend/services/theme-engine/i18n.test.js b/ghost/core/test/unit/frontend/services/theme-engine/i18n.test.js
index 95b1458d7f..25a3e9c009 100644
--- a/ghost/core/test/unit/frontend/services/theme-engine/i18n.test.js
+++ b/ghost/core/test/unit/frontend/services/theme-engine/i18n.test.js
@@ -3,25 +3,22 @@ const sinon = require('sinon');
 
 const I18n = require('../../../../../core/frontend/services/theme-engine/i18n/i18n');
 
-const logging = {
-    warn: sinon.stub(),
-    error: sinon.stub()
-};
+const logging = require('@tryghost/logging');
 
 describe('I18n Class behavior', function () {
     it('defaults to en', function () {
-        const i18n = new I18n({logging});
+        const i18n = new I18n();
         i18n.locale().should.eql('en');
     });
 
     it('can have a different locale set', function () {
-        const i18n = new I18n({locale: 'fr', logging});
+        const i18n = new I18n({locale: 'fr'});
         i18n.locale().should.eql('fr');
     });
 
     describe('file loading behavior', function () {
         it('will fallback to en file correctly without changing locale', function () {
-            const i18n = new I18n({locale: 'fr', logging});
+            const i18n = new I18n({locale: 'fr'});
 
             let fileSpy = sinon.spy(i18n, '_readTranslationsFile');
 
@@ -41,7 +38,7 @@ describe('I18n Class behavior', function () {
         let i18n;
 
         beforeEach(function initBasicI18n() {
-            i18n = new I18n({logging});
+            i18n = new I18n();
             sinon.stub(i18n, '_loadStrings').returns(fakeStrings);
             i18n.init();
         });
@@ -55,7 +52,9 @@ describe('I18n Class behavior', function () {
         });
 
         it('uses key fallback correctly', function () {
+            const loggingStub = sinon.stub(logging, 'error');
             i18n.t('unknown.string').should.eql('An error occurred');
+            sinon.assert.calledOnce(loggingStub);
         });
 
         it('errors for invalid strings', function () {
@@ -70,11 +69,15 @@ describe('I18n Class behavior', function () {
         let i18n;
 
         beforeEach(function initFulltextI18n() {
-            i18n = new I18n({stringMode: 'fulltext', logging});
+            i18n = new I18n({stringMode: 'fulltext'});
             sinon.stub(i18n, '_loadStrings').returns(fakeStrings);
             i18n.init();
         });
 
+        afterEach(function () {
+            sinon.restore();
+        });
+
         it('correctly loads strings', function () {
             i18n._strings.should.eql(fakeStrings);
         });
diff --git a/ghost/core/test/unit/server/adapters/scheduling/SchedulingDefault.test.js b/ghost/core/test/unit/server/adapters/scheduling/SchedulingDefault.test.js
index 3e2e069e66..6992040c96 100644
--- a/ghost/core/test/unit/server/adapters/scheduling/SchedulingDefault.test.js
+++ b/ghost/core/test/unit/server/adapters/scheduling/SchedulingDefault.test.js
@@ -4,6 +4,7 @@ const moment = require('moment');
 const _ = require('lodash');
 const nock = require('nock');
 const SchedulingDefault = require('../../../../../core/server/adapters/scheduling/SchedulingDefault');
+const logging = require('@tryghost/logging');
 
 describe('Scheduling Default Adapter', function () {
     const scope = {};
@@ -315,6 +316,8 @@ describe('Scheduling Default Adapter', function () {
             it('pingUrl, but blog returns 503', function (done) {
                 scope.adapter.retryTimeoutInMs = 50;
 
+                const loggingStub = sinon.stub(logging, 'error');
+
                 const ping = nock('http://localhost:1111')
                     .put('/ping').reply(503)
                     .put('/ping').reply(503)
@@ -330,6 +333,7 @@ describe('Scheduling Default Adapter', function () {
 
                 (function retry() {
                     if (ping.isDone()) {
+                        sinon.assert.calledTwice(loggingStub);
                         return done();
                     }
 
diff --git a/ghost/core/test/unit/server/adapters/scheduling/post-scheduling/post-scheduler.test.js b/ghost/core/test/unit/server/adapters/scheduling/post-scheduling/post-scheduler.test.js
index 80a9d453b5..cb27ef8a75 100644
--- a/ghost/core/test/unit/server/adapters/scheduling/post-scheduling/post-scheduler.test.js
+++ b/ghost/core/test/unit/server/adapters/scheduling/post-scheduling/post-scheduler.test.js
@@ -10,6 +10,7 @@ const schedulingUtils = require('../../../../../../core/server/adapters/scheduli
 const SchedulingDefault = require('../../../../../../core/server/adapters/scheduling/SchedulingDefault');
 const urlUtils = require('../../../../../../core/shared/url-utils');
 const PostScheduler = require('../../../../../../core/server/adapters/scheduling/post-scheduling/post-scheduler');
+const nock = require('nock');
 
 describe('Scheduling: Post Scheduler', function () {
     let adapter;
@@ -38,9 +39,15 @@ describe('Scheduling: Post Scheduler', function () {
                     id: 1337,
                     mobiledoc: testUtils.DataGenerator.markdownToMobiledoc('something')
                 }));
+                nock('http://scheduler.local:1111')
+                    .get(() => true)
+                    .reply(200);
+                nock('http://scheduler.local:1111')
+                    .post(() => true)
+                    .reply(200);
 
                 new PostScheduler({
-                    apiUrl: 'localhost:1111/',
+                    apiUrl: 'scheduler.local:1111/',
                     integration: {
                         api_keys: [{
                             id: 'integrationUniqueId',
@@ -64,7 +71,7 @@ describe('Scheduling: Post Scheduler', function () {
                 adapter.schedule.calledOnce.should.eql(true);
 
                 adapter.schedule.args[0][0].time.should.equal(moment(post.get('published_at')).valueOf());
-                adapter.schedule.args[0][0].url.should.startWith(urlUtils.urlJoin('localhost:1111/', 'schedules', 'posts', post.get('id'), '?token='));
+                adapter.schedule.args[0][0].url.should.startWith(urlUtils.urlJoin('scheduler.local:1111/', 'schedules', 'posts', post.get('id'), '?token='));
                 adapter.schedule.args[0][0].extra.httpMethod.should.eql('PUT');
                 should.equal(null, adapter.schedule.args[0][0].extra.oldTime);
             });
diff --git a/ghost/core/test/unit/server/data/exporter/index.test.js b/ghost/core/test/unit/server/data/exporter/index.test.js
index f18d5f1723..32942ed91d 100644
--- a/ghost/core/test/unit/server/data/exporter/index.test.js
+++ b/ghost/core/test/unit/server/data/exporter/index.test.js
@@ -5,6 +5,7 @@ const db = require('../../../../../core/server/data/db');
 const exporter = require('../../../../../core/server/data/exporter');
 const schema = require('../../../../../core/server/data/schema');
 const models = require('../../../../../core/server/models');
+const logging = require('@tryghost/logging');
 const schemaTables = Object.keys(schema.tables);
 
 describe('Exporter', function () {
@@ -190,10 +191,12 @@ describe('Exporter', function () {
             const settingsStub = sinon.stub(models.Settings, 'findOne').returns(
                 Promise.reject()
             );
+            const loggingStub = sinon.stub(logging, 'error');
 
             exporter.fileName().then(function (result) {
                 should.exist(result);
                 settingsStub.calledOnce.should.be.true();
+                loggingStub.calledOnce.should.be.true();
                 result.should.match(/^ghost\.[0-9]{4}-[0-9]{2}-[0-9]{2}-[0-9]{2}-[0-9]{2}-[0-9]{2}\.json$/);
 
                 done();
diff --git a/ghost/core/test/unit/server/data/importer/index.test.js b/ghost/core/test/unit/server/data/importer/index.test.js
index f1a755b175..73ed616187 100644
--- a/ghost/core/test/unit/server/data/importer/index.test.js
+++ b/ghost/core/test/unit/server/data/importer/index.test.js
@@ -19,6 +19,7 @@ const DataImporter = require('../../../../../core/server/data/importer/importers
 const ImageImporter = require('../../../../../core/server/data/importer/importers/image');
 const RevueImporter = require('@tryghost/importer-revue');
 const configUtils = require('../../../../utils/configUtils');
+const logging = require('@tryghost/logging');
 
 describe('Importer', function () {
     afterEach(async function () {
@@ -137,12 +138,14 @@ describe('Importer', function () {
         });
 
         it('silently ignores clean up errors', async function () {
+            const loggingStub = sinon.stub(logging, 'error');
             const file = path.resolve('test/utils/fixtures/import/zips/zip-with-base-dir');
             ImportManager.fileToDelete = file;
             const removeStub = sinon.stub(fs, 'remove').withArgs(file).returns(Promise.reject(new Error('Unknown file')));
 
             await ImportManager.cleanUp();
             removeStub.calledOnce.should.be.true();
+            loggingStub.calledOnce.should.be.true();
             should(ImportManager.fileToDelete).be.null();
         });
 
diff --git a/ghost/core/test/unit/server/lib/image/cached-image-size-from-url.test.js b/ghost/core/test/unit/server/lib/image/cached-image-size-from-url.test.js
index 99d1cd5f19..c776785b7f 100644
--- a/ghost/core/test/unit/server/lib/image/cached-image-size-from-url.test.js
+++ b/ghost/core/test/unit/server/lib/image/cached-image-size-from-url.test.js
@@ -3,6 +3,7 @@ const should = require('should');
 const sinon = require('sinon');
 const CachedImageSizeFromUrl = require('../../../../../core/server/lib/image/cached-image-size-from-url');
 const InMemoryCache = require('../../../../../core/server/adapters/cache/Memory');
+const logging = require('@tryghost/logging');
 
 describe('lib/image: image size cache', function () {
     let sizeOfStub;
@@ -70,6 +71,7 @@ describe('lib/image: image size cache', function () {
             cache: cacheStore
         });
 
+        const loggingStub = sinon.stub(logging, 'error');
         await cachedImageSizeFromUrl.getCachedImageSizeFromUrl(url);
 
         cacheStore.get(url).should.not.be.undefined;
@@ -77,6 +79,7 @@ describe('lib/image: image size cache', function () {
         should.equal(image.url, 'http://mysite.com/content/image/mypostcoverimage.jpg');
         should.not.exist(image.width);
         should.not.exist(image.height);
+        sinon.assert.calledOnce(loggingStub);
     });
 
     it('can handle NotFoundError error', async function () {
diff --git a/ghost/core/test/unit/server/lib/mobiledoc.test.js b/ghost/core/test/unit/server/lib/mobiledoc.test.js
index 847f58d54d..240551fb79 100644
--- a/ghost/core/test/unit/server/lib/mobiledoc.test.js
+++ b/ghost/core/test/unit/server/lib/mobiledoc.test.js
@@ -7,6 +7,7 @@ const mobiledocLib = require('../../../../core/server/lib/mobiledoc');
 const storage = require('../../../../core/server/adapters/storage');
 const urlUtils = require('../../../../core/shared/url-utils');
 const mockUtils = require('../../../utils/mocks');
+const logging = require('@tryghost/logging');
 
 describe('lib/mobiledoc', function () {
     afterEach(async function () {
@@ -296,6 +297,7 @@ describe('lib/mobiledoc', function () {
 
     describe('populateImageSizes', function () {
         let originalStoragePath;
+        let loggingStub;
 
         beforeEach(function () {
             originalStoragePath = storage.getStorage().storagePath;
@@ -316,6 +318,12 @@ describe('lib/mobiledoc', function () {
                 ]
             };
 
+            loggingStub = sinon.stub(logging, 'error');
+
+            nock('http://example.com/')
+                .get('/external.jpg')
+                .query(true)
+                .reply(404, 'Image not found');
             const unsplashMock = nock('https://images.unsplash.com/')
                 .get('/favicon_too_large')
                 .query(true)
@@ -327,6 +335,7 @@ describe('lib/mobiledoc', function () {
             const transformed = JSON.parse(transformedMobiledoc);
 
             unsplashMock.isDone().should.be.true();
+            sinon.assert.calledOnce(loggingStub);
 
             transformed.cards.length.should.equal(4);
         });
diff --git a/ghost/core/test/unit/server/services/frontend-data-service/frontend-data-service.test.js b/ghost/core/test/unit/server/services/frontend-data-service/frontend-data-service.test.js
index 882d76fee8..9785160055 100644
--- a/ghost/core/test/unit/server/services/frontend-data-service/frontend-data-service.test.js
+++ b/ghost/core/test/unit/server/services/frontend-data-service/frontend-data-service.test.js
@@ -5,6 +5,8 @@ const models = require('../../../../../core/server/models');
 
 const FrontendDataService = require('../../../../../core/server/services/frontend-data-service/frontend-data-service');
 
+const logging = require('@tryghost/logging');
+
 describe('Frontend Data Service', function () {
     let service, modelStub, fakeModel;
 
@@ -32,11 +34,14 @@ describe('Frontend Data Service', function () {
 
     it('returns null if anything goes wrong', async function () {
         modelStub.returns();
+        const loggingStub = sinon.stub(logging, 'error');
 
         const key = await service.getFrontendKey();
 
         sinon.assert.calledOnce(modelStub);
         assert.equal(key, null);
+        sinon.assert.calledOnce(loggingStub);
+        assert.equal(loggingStub.firstCall.firstArg.message, 'Unable to find the internal frontend key');
     });
 
     it('returns the key from a model response', async function () {
diff --git a/ghost/core/test/unit/server/services/mega/post-email-serializer.test.js b/ghost/core/test/unit/server/services/mega/post-email-serializer.test.js
index 0745d5db95..76b01ee2d4 100644
--- a/ghost/core/test/unit/server/services/mega/post-email-serializer.test.js
+++ b/ghost/core/test/unit/server/services/mega/post-email-serializer.test.js
@@ -8,6 +8,7 @@ const labs = require('../../../../../core/shared/labs');
 const {parseReplacements, renderEmailForSegment, serialize, _getTemplateSettings, createUnsubscribeUrl, createPostSignupUrl, _PostEmailSerializer} = require('../../../../../core/server/services/mega/post-email-serializer');
 const {HtmlValidate} = require('html-validate');
 const audienceFeedback = require('../../../../../core/server/services/audience-feedback');
+const logging = require('@tryghost/logging');
 
 function assertKeys(object, keys) {
     assert.deepStrictEqual(Object.keys(object).sort(), keys.sort());
@@ -104,6 +105,7 @@ describe('Post Email Serializer', function () {
         });
 
         it('should output valid HTML and escape HTML characters in mobiledoc', async function () {
+            const loggingStub = sinon.stub(logging, 'error');
             sinon.stub(_PostEmailSerializer, 'serializePostModel').callsFake(async () => {
                 return {
                     // This is not realistic, but just to test escaping
@@ -159,6 +161,9 @@ describe('Post Email Serializer', function () {
 
             const output = await serialize({}, newsletterMock, {isBrowserPreview: false});
 
+            loggingStub.calledOnce.should.be.true();
+            loggingStub.firstCall.firstArg.should.have.property('code').eql('IMAGE_SIZE_URL');
+
             const htmlvalidate = new HtmlValidate({
                 extends: [
                     'html-validate:document',
@@ -928,7 +933,7 @@ describe('Post Email Serializer', function () {
             const newsletterMock = {
                 get: function (key) {
                     return {
-                        header_image: 'image',
+                        header_image: '',
                         show_header_icon: true,
                         show_header_title: true,
                         show_feature_image: true,
@@ -944,7 +949,7 @@ describe('Post Email Serializer', function () {
             };
             const res = await _getTemplateSettings(newsletterMock);
             assert.deepStrictEqual(res, {
-                headerImage: 'image',
+                headerImage: '',
                 showHeaderIcon: 'icon2',
                 showHeaderTitle: true,
                 showFeatureImage: true,
diff --git a/ghost/core/test/unit/server/services/mentions/RoutingService.test.js b/ghost/core/test/unit/server/services/mentions/RoutingService.test.js
index 3410747947..bb22c21812 100644
--- a/ghost/core/test/unit/server/services/mentions/RoutingService.test.js
+++ b/ghost/core/test/unit/server/services/mentions/RoutingService.test.js
@@ -4,12 +4,16 @@ const nock = require('nock');
 const got = require('got');
 const ObjectID = require('bson-objectid').default;
 const RoutingService = require('../../../../../core/server/services/mentions/RoutingService');
+const logging = require('@tryghost/logging');
 
 describe('RoutingService', function () {
+    let loggingStub;
+
     afterEach(function () {
         sinon.restore();
         nock.cleanAll();
     });
+
     describe('pageExists', function () {
         describe('URL checks', function () {
             it('Returns false if the url is from a different origin', async function () {
@@ -141,12 +145,15 @@ describe('RoutingService', function () {
                     externalRequest: got
                 });
 
+                loggingStub = sinon.stub(logging, 'error');
+
                 resourceService.getByURL.resolves({type: null, id: null});
 
                 nock('https://website.com').head('/subdir/big-error').reply(500);
 
                 const result = await routingService.pageExists(new URL('https://website.com/subdir/big-error'));
                 assert.equal(result, false);
+                sinon.assert.calledOnce(loggingStub);
             });
         });
     });
diff --git a/ghost/core/test/unit/server/services/slack.test.js b/ghost/core/test/unit/server/services/slack.test.js
index 8715713ada..0a8a537dd8 100644
--- a/ghost/core/test/unit/server/services/slack.test.js
+++ b/ghost/core/test/unit/server/services/slack.test.js
@@ -18,6 +18,7 @@ const slackURL = 'https://hooks.slack.com/services/a-b-c-d';
 
 describe('Slack', function () {
     let eventStub;
+    let loggingStub;
 
     beforeEach(function () {
         eventStub = sinon.stub(events, 'on');
@@ -102,7 +103,6 @@ describe('Slack', function () {
             sinon.stub(urlService, 'getUrlByResourceId');
 
             settingsCacheStub = sinon.stub(settingsCache, 'get');
-            sinon.spy(logging, 'error');
 
             makeRequestStub = sinon.stub();
             slackReset = slack.__set__('request', makeRequestStub);
@@ -173,6 +173,7 @@ describe('Slack', function () {
         });
 
         it('makes a request and errors', function (done) {
+            loggingStub = sinon.stub(logging, 'error');
             makeRequestStub.rejects();
             settingsCacheStub.withArgs('slack_url').returns(slackURL);
 
@@ -180,7 +181,7 @@ describe('Slack', function () {
             ping({});
 
             (function retry() {
-                if (logging.error.calledOnce) {
+                if (loggingStub.calledOnce) {
                     makeRequestStub.calledOnce.should.be.true();
                     return done();
                 }
diff --git a/ghost/core/test/unit/server/services/themes/validate.test.js b/ghost/core/test/unit/server/services/themes/validate.test.js
index c231620328..b14fcd8297 100644
--- a/ghost/core/test/unit/server/services/themes/validate.test.js
+++ b/ghost/core/test/unit/server/services/themes/validate.test.js
@@ -7,12 +7,14 @@ const gscan = require('gscan');
 const assert = require('assert');
 const adapterManager = require('../../../../../core/server/services/adapter-manager');
 const InMemoryCache = require('../../../../../core/server/adapters/cache/Memory');
+const logging = require('@tryghost/logging');
 
 describe('Themes', function () {
     let checkZipStub;
     let checkStub;
     let formatStub;
     let adapterStub;
+    let loggingStub;
 
     beforeEach(function () {
         checkZipStub = sinon.stub(gscan, 'checkZip');
@@ -183,10 +185,12 @@ describe('Themes', function () {
         });
 
         it('Silently fails when cache adapter throws', async function () {
+            loggingStub = sinon.stub(logging, 'error');
             sinon.stub(adapterManager, 'getAdapter').returns({
                 get: () => {
                     throw new Error('test');
-                }
+                },
+                set: () => {}
             });
             validate.init();
 
@@ -196,6 +200,8 @@ describe('Themes', function () {
             const checkedTheme = await validate.getThemeErrors(testTheme.name);
             sinon.assert.calledOnce(checkStub);
             sinon.assert.calledOnce(formatStub);
+            // Two calls to logging.error occur in the check function
+            sinon.assert.calledTwice(loggingStub);
             assert.deepEqual(checkedTheme, {errors: [{hello: 'world'}], warnings: []});
         });
     });