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

Removed bluebird promise wrap in request lib (#9343)

Browse source 
refs #9178, refs #8988

With 7353c87d7f we use Bluebird globally for Promises. Therefore, the request lib doesn't need to be wrapped in a bluebird Promise anymore.

This was originally done, so we can work with catch predicated in our image-size lib.

Updated the tests to proof, that the catch predicates work.

The tests fail, as soon as the Promise overwrite is commented out.
This commit is contained in:
Aileen Nowak 2018-01-02 18:18:56 +07:00 • committed by Katharina Irrgang
parent 98dcbd72bc
commit ae741b1a18
2 changed files with 22 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
core/server/lib/request.js
View file

@ -1,5 +1,4 @@
var got = require('got'),
Promise = require('bluebird'),
_ = require('lodash'),
validator = require('../data/validation').validator,
common = require('./common');
@ -13,14 +12,5 @@ module.exports = function request(url, options) {
}));
}
return new Promise(function (resolve, reject) {
return got(
url,
options
).then(function (response) {
return resolve(response);
}).catch(function (err) {
return reject(err);
});
});
return got(url, options);
};

22
core/test/unit/lib/image/image-size_spec.js
View file

@ -300,6 +300,20 @@ describe('lib/image: image size', function () {
.catch(function (err) {
requestMock.isDone().should.be.true();
should.exist(err);
err.errorType.should.be.equal('NotFoundError');
err.message.should.be.equal('Image not found.');
done();
});
});
it('[failure] handles invalid URL', function (done) {
var url = 'Not-a-valid-url';
result = imageSize.getImageSizeFromUrl(url)
.catch(function (err) {
should.exist(err);
err.errorType.should.be.equal('InternalServerError');
err.message.should.be.equal('URL empty or invalid.');
done();
});
});
@ -317,6 +331,8 @@ describe('lib/image: image size', function () {
.catch(function (err) {
requestMock.isDone().should.be.true();
should.exist(err);
err.errorType.should.be.equal('InternalServerError');
err.message.should.be.equal('Request timed out.');
done();
});
});
@ -338,6 +354,8 @@ describe('lib/image: image size', function () {
.catch(function (err) {
requestMock.isDone().should.be.true();
should.exist(err);
err.errorType.should.be.equal('InternalServerError');
err.error.should.be.equal('image-size could not find dimensions');
done();
});
});
@ -347,12 +365,14 @@ describe('lib/image: image size', function () {
requestMock = nock('https://notarealwebsite.com')
.get('/images/notapicture.jpg')
.reply(404, {message: 'something awful happened', code: 'AWFUL_ERROR'});
.reply(500, {message: 'something awful happened', code: 'AWFUL_ERROR'});
result = imageSize.getImageSizeFromUrl(url)
.catch(function (err) {
requestMock.isDone().should.be.true();
should.exist(err);
err.errorType.should.be.equal('InternalServerError');
err.message.should.be.equal('Unknown Request error.');
done();
});
});