Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-01-06 22:40:14 -05:00
Code Issues Activity

🐛 Use isIgnitionError to detect unhandled errors (#8100)

Browse source 
closes #8099, refs https://github.com/TryGhost/Ignition/issues/28

- use new utility to detect if an error has not yet been handled & convert it to a generic Ghost error
- update theme_spec tests to include checking error messages, which catches this issue
This commit is contained in:
Hannah Wolfe 2017-03-06 16:37:16 +00:00 committed by Katharina Irrgang
parent fdcc66bdbf
commit 9aec9c6a63
2 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/server/middleware/error-handler.js
View file

@ -58,7 +58,7 @@ _private.prepareError = function prepareError(err, req, res, next) {
err = err[0];
}
if (!(err instanceof errors.GhostError)) {
if (!errors.utils.isIgnitionError(err)) {
// We need a special case for 404 errors
// @TODO look at adding this to the GhostError class
if (err.statusCode && err.statusCode === 404) {

20
core/test/functional/routes/api/themes_spec.js
View file

@ -255,6 +255,12 @@ describe('Themes API', function () {
}
res.statusCode.should.eql(403);
should.exist(res.body.errors);
res.body.errors.should.be.an.Array().with.lengthOf(1);
res.body.errors[0].errorType.should.eql('NoPermissionError');
res.body.errors[0].message.should.eql('You do not have permission to add themes');
done();
});
});
@ -263,11 +269,16 @@ describe('Themes API', function () {
request.del(testUtils.API.getApiQuery('themes/test'))
.set('Authorization', 'Bearer ' + scope.editorAccessToken)
.expect(403)
.end(function (err) {
.end(function (err, res) {
if (err) {
return done(err);
}
should.exist(res.body.errors);
res.body.errors.should.be.an.Array().with.lengthOf(1);
res.body.errors[0].errorType.should.eql('NoPermissionError');
res.body.errors[0].message.should.eql('You do not have permission to destroy themes');
done();
});
});
@ -276,11 +287,16 @@ describe('Themes API', function () {
request.get(testUtils.API.getApiQuery('themes/casper/download/'))
.set('Authorization', 'Bearer ' + scope.editorAccessToken)
.expect(403)
.end(function (err) {
.end(function (err, res) {
if (err) {
return done(err);
}
should.exist(res.body.errors);
res.body.errors.should.be.an.Array().with.lengthOf(1);
res.body.errors[0].errorType.should.eql('NoPermissionError');
res.body.errors[0].message.should.eql('You do not have permission to read themes');
done();
});
});