TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-12-01 13:54:35 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #5999 from delgermurun/api-db-refactor

Browse Source 
db api endpoint validation error refactor
This commit is contained in:
Hannah Wolfe 2015-11-02 13:16:07 +00:00
commit 0c9befc16f
2 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/server/api/db.js
View File

@ -66,7 +66,7 @@ db = {
function validate(options) {
// Check if a file was provided
if (!utils.checkFileExists(options, 'importfile')) {
return Promise.reject(new errors.NoPermissionError('Please select a file to import.'));
return Promise.reject(new errors.ValidationError('Please select a file to import.'));
}
// Check if the file is valid

32
core/test/integration/api/api_db_spec.js
View File

@ -2,6 +2,7 @@
/*jshint expr:true*/
var testUtils = require('../../utils'),
should = require('should'),
_ = require('lodash'),
// Stuff we are testing
dbAPI = require('../../../server/api/db'),
@ -93,16 +94,22 @@ describe('DB API', function () {
});
it('import content is denied (editor, author & without authentication)', function (done) {
return dbAPI.importContent(testUtils.context.editor).then(function () {
var file = {importfile: {
name: 'myFile.json',
path: '/my/path/myFile.json',
type: 'application/json'
}};
return dbAPI.importContent(_.extend(testUtils.context.editor, file)).then(function () {
done(new Error('Import content is not denied for editor.'));
}, function (error) {
error.errorType.should.eql('NoPermissionError');
return dbAPI.importContent(testUtils.context.author);
return dbAPI.importContent(_.extend(testUtils.context.author, file));
}).then(function () {
done(new Error('Import content is not denied for author.'));
}, function (error) {
error.errorType.should.eql('NoPermissionError');
return dbAPI.importContent();
return dbAPI.importContent(file);
}).then(function () {
done(new Error('Import content is not denied without authentication.'));
}).catch(function (error) {
@ -110,4 +117,23 @@ describe('DB API', function () {
done();
}).catch(done);
});
it('import content should fail without file & with unsupported file', function (done) {
return dbAPI.importContent(testUtils.context.admin).then(function () {
done(new Error('Import content is not failed without file.'));
}, function (error) {
error.errorType.should.eql('ValidationError');
var context = _.extend(testUtils.context.admin, {
importfile: {name: 'myFile.docx', path: '/my/path/myFile.docx', type: 'application/docx'}
});
return dbAPI.importContent(context);
}).then(function () {
done(new Error('Import content is not failed with unsupported.'));
}, function (error) {
error.errorType.should.eql('UnsupportedMediaTypeError');
done();
}).catch(done);
});
});