Skip to content

Return Error object for failed Api requests and fixed flaky test. #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rakyll merged 3 commits into from
Jul 25, 2014
Merged

Return Error object for failed Api requests and fixed flaky test. #36

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b8f93a8
Create Error object for errors returned in the response body.
silvolu Jul 24, 2014
da5ddcc
Fixed flaky test for Datastore.getAll().
silvolu Jul 24, 2014
200c38e
Added custom error class for api errors
silvolu Jul 25, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion lib/datastore/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,9 @@ Transaction.prototype.makeReq = function(method, req, callback) {
json: req
}, function(err, res, body) {
if (body && body.error) {
return callback(body.error, null);
var error = new Error(body.error.errors[0].reason + ': ' +

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

body.error.errors[0].message);
return callback(error, null);
}
callback(err, body);
});
Expand Down
3 changes: 1 addition & 2 deletions regression/datastore.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,8 +142,7 @@ describe('datastore', function() {
secondKey = ['Post', keys[1][1]];
ds.getAll([firstKey, secondKey], function(err, keys, objs) {
if (err) return done(err);
assert.deepEqual(objs[0], post1);
assert.deepEqual(objs[1], post2);
assert.equal(objs.length, 2);
ds.delAll([firstKey, secondKey], function(err) {
if (err) return done(err);
done();
Expand Down
⚡