From 0622c5418fd30e4acb8175ab0a2ef93bb55d188d Mon Sep 17 00:00:00 2001
From: Ritchie Martori <skawful@gmail.com>
Date: Wed, 21 Nov 2012 13:32:44 -0800
Subject: [PATCH] fixed missing ctx properties in tests

---
 lib/modules/collection/index.js |  2 +-
 lib/resource.js                 |  2 +-
 test/collection.unit.js         | 18 +++++++++---------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/lib/modules/collection/index.js b/lib/modules/collection/index.js
index c9276b0..76e17d3 100644
--- a/lib/modules/collection/index.js
+++ b/lib/modules/collection/index.js
@@ -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 */
diff --git a/lib/resource.js b/lib/resource.js
index 14b86db..3628688 100644
--- a/lib/resource.js
+++ b/lib/resource.js
@@ -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;
diff --git a/test/collection.unit.js b/test/collection.unit.js
index 34a6668..ccda029 100644
--- a/test/collection.unit.js
+++ b/test/collection.unit.js
@@ -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;