Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-04-01 02:41:39 -05:00
Code Issues Activity

@tryghost/update-check-service: Don't allow logging to be passed in to constructor

Browse source 
refs: https://github.com/TryGhost/Toolbox/issues/146
This commit is contained in:
Sam Lord 2021-12-07 10:48:01 +00:00
parent feabbc2fca
commit d407fd1325
2 changed files with 8 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ghost/update-check-service/lib/update-check-service.js
View file

@ -6,6 +6,7 @@ const Promise = require('bluebird');
const exec = require('child_process').exec;
const tpl = require('@tryghost/tpl');
const errors = require('@tryghost/errors');
const logging = require('@tryghost/logging');
const debug = require('@tryghost/debug')('update-check');
const internal = {context: {internal: true}};
@ -47,11 +48,10 @@ class UpdateCheckService {
* @param {string} options.config.siteUrl - Ghost instance URL
* @param {boolean} [options.config.forceUpdate]
* @param {string} options.config.ghostVersion - Ghost instance version
* @param {Object} [options.logging] - logging override defaults to @tryghost/logging if not specified
* @param {Function} options.request - a HTTP request proxy function
* @param {Function} options.sendEmail - function handling sending an email
*/
constructor({api, config, logging = require('@tryghost/logging'), request, sendEmail}) {
constructor({api, config, request, sendEmail}) {
this.api = api;
this.config = config;
this.logging = logging;

21
ghost/update-check-service/test/update-check-service.test.js
View file

@ -4,12 +4,12 @@ const sinon = require('sinon');
const moment = require('moment');
const uuid = require('uuid');
const logging = require('@tryghost/logging');
const UpdateCheckService = require('../lib/update-check-service');
describe('Update Check', function () {
const internal = {context: {internal: true}};
let settingsStub;
let loggingStub;
let requestStub;
beforeEach(function () {
@ -27,9 +27,7 @@ describe('Update Check', function () {
}]
});
loggingStub = {
error: sinon.stub()
};
sinon.stub(logging, 'error');
requestStub = sinon.stub();
});
@ -59,7 +57,6 @@ describe('Update Check', function () {
isPrivacyDisabled: true,
ghostVersion: '0.8.0'
},
logging: loggingStub,
request: requestStub
});
@ -119,7 +116,6 @@ describe('Update Check', function () {
isPrivacyDisabled: true,
ghostVersion: '5.3.4'
},
logging: loggingStub,
request: requestStub
});
@ -165,7 +161,6 @@ describe('Update Check', function () {
databaseType: 'mysql',
ghostVersion: '4.0.0'
},
logging: loggingStub,
request: requestStub,
ghostMailer: {
send: sinon.stub().resolves()
@ -236,7 +231,6 @@ describe('Update Check', function () {
config: {
siteUrl: 'https://localhost:2368/test'
},
logging: loggingStub,
request: sinon.stub().resolves({
body: {
notifications: [notification]
@ -311,7 +305,6 @@ describe('Update Check', function () {
config: {
siteUrl: 'http://127.0.0.1:2369'
},
logging: loggingStub,
request: sinon.stub().resolves({
body: [notification]
}),
@ -358,7 +351,6 @@ describe('Update Check', function () {
config: {
siteUrl: 'https://localhost:2368/test'
},
logging: loggingStub,
request: sinon.stub().resolves({
body: {
notifications: []
@ -379,16 +371,15 @@ describe('Update Check', function () {
settings: {
edit: settingsStub
}
},
logging: loggingStub
}
});
updateCheckService.updateCheckError({});
settingsStub.called.should.be.true();
loggingStub.error.called.should.be.true();
loggingStub.error.args[0][0].context.should.equal('Checking for updates failed, your site will continue to function.');
loggingStub.error.args[0][0].help.should.equal('If you get this error repeatedly, please seek help from https://ghost.org/docs/');
logging.error.called.should.be.true();
logging.error.args[0][0].context.should.equal('Checking for updates failed, your site will continue to function.');
logging.error.args[0][0].help.should.equal('If you get this error repeatedly, please seek help from https://ghost.org/docs/');
});
});
});