kylefang/deployd
1
0
Fork 0
mirror of https://github.com/zhigang1992/deployd.git synced 2026-05-13 12:37:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixed missing ctx properties in tests

Browse Source
This commit is contained in:
Ritchie Martori
2012-11-21 13:32:44 -08:00
parent ec65a8721b
commit 0622c5418f
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/modules/collection/index.js
View File

@@ -247,7 +247,7 @@ Collection.prototype.handle = function (ctx) {
this.find(ctx, ctx.done);
break;
case 'PUT':
if (typeof ctx.query.id != 'string') {
if (!ctx.query.id && ctx.body) {
return this.saveAll(ctx, ctx.done);
}
/* falls through */

2
lib/resource.js
View File

@@ -161,7 +161,7 @@ Resource.prototype.parseEvent = function (ctx) {
Resource.prototype.verifyPermissions = function (ctx, fn) {
if(ctx.req.internal || ctx.req.isRoot) return fn();
var required = this.requiredPermissions[ctx.method];
var required = this.requiredPermissions[ctx.method || ctx.req.method];
var requested = ctx.permissions || this.defaultPermissions;
var isSingle = !!ctx.query.id || ctx.method === 'POST';
var failed = false;

18
test/collection.unit.js
View File

@@ -171,7 +171,7 @@ describe('collection', function(){
it('should save the provided data', function(done) {
var c = new Collection('counts', {db: db.create(TEST_DB), config: { properties: {count: {type: 'number'}}}});
c.save({session: {}, body: {count: 1}, query: {}, dpd: {}}, function (err, item) {
c.save({session: {}, body: {count: 1}, query: {}, dpd: {}, req: {}, res: {}, done: done, method: 'POST'}, function (err, item) {
expect(item.id).to.exist;
expect(err).to.not.exist;
done();
@@ -181,10 +181,10 @@ describe('collection', function(){
it('should pass commands like $inc', function(done) {
var c = new Collection('counts', {db: db.create(TEST_DB), config: { properties: {count: {type: 'number'}}}});
c.save({body: {count: 1}}, function (err, item) {
c.save({body: {count: 1}, req: {}, res: {}, method: 'POST', query: {}}, function (err, item) {
expect(item.id).to.exist;
expect(err).to.not.exist;
c.save({body: {count: {$inc: 100}}, query: {id: item.id}}, function (err, updated) {
c.save({body: {count: {$inc: 100}}, query: {id: item.id}, req: {}, res: {}, done: done, method: 'PUT'}, function (err, updated) {
expect(err).to.not.exist;
expect(updated).to.exist;
expect(updated.count).to.equal(101);
@@ -209,8 +209,8 @@ describe('collection', function(){
it('should return the provided data', function(done) {
var c = new Collection('foo', {db: db.create(TEST_DB), config: { properties: {count: {type: 'number'}}}});
c.save({body: {count: 1}}, function (err, item) {
c.find({}, function (err, items) {
c.save({body: {count: 1}, query: {}, req: {}, res: {}, done: done, method: 'POST'}, function (err, item) {
c.find({query: {}, req: {}, res: {}, done: done, method: 'GET'}, function (err, items) {
expect(items.length).to.equal(1);
done(err);
});
@@ -220,10 +220,10 @@ describe('collection', function(){
it('should return the provided data in sorted order', function(done) {
var c = new Collection('sort', { db: db.create(TEST_DB), config: { properties: {count: {type: 'number'}}}});
c.save({body: {count: 1}}, function (err, item) {
c.save({body: {count: 3}}, function (err, item) {
c.save({body: {count: 2}}, function (err, item) {
c.find({query: {$sort: {count: 1}}}, function (err, items) {
c.save({body: {count: 1}, query: {}, req: {}, res: {}, done: done, method: 'POST'}, function (err, item) {
c.save({body: {count: 3}, query: {}, req: {}, res: {}, done: done, method: 'POST'}, function (err, item) {
c.save({body: {count: 2}, query: {}, req: {}, res: {}, done: done, method: 'POST'}, function (err, item) {
c.find({query: {$sort: {count: 1}}, req: {}, res: {}, done: done, method: 'GET'}, function (err, items) {
expect(items.length).to.equal(3);
for(var i = 0; i < 3; i++) {
delete items[i].id;