Add async param modify tests

macalinao · Aug 12, 2014 · fdd712f · fdd712f
1 parent 40f032a
commit fdd712f
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 3 deletions.
diff --git a/lib/model.js b/lib/model.js
@@ -95,9 +95,11 @@ Model.prototype.applyModifiers = function(request, done) {
     // Sync
     if (modFn.length === 2) {
       try {
-        req.query[mod.param] = modFn(req, val);
-        if (req.query[mod.param] === false) {
+        var ret = modFn(req, val);
+        if (ret === false) {
           delete req.query[mod.param];
+        } else {
+          req.query[mod.param] = ret;
         }
       } catch (err) {
         return next(err, null);
@@ -106,7 +108,12 @@ Model.prototype.applyModifiers = function(request, done) {
     }
 
     // Async
-    modFn(req, val, function(err) {
+    modFn(req, val, function(err, ret) {
+      if (ret === false) {
+        delete req.query[mod.param];
+      } else {
+        req.query[mod.param] = ret;
+      }
       return next(err, req);
     });
   }

diff --git a/test/model.js b/test/model.js
@@ -31,6 +31,32 @@ describe('Model', function() {
     expect(User.restricted).to.eql(['password']);
   });
 
+  describe('modifiers', function() {
+    it('should synchronously modify params', function() {
+      User.modifyParam('name', function(req, value) {
+        return 'Tim';
+      });
+      User.applyModifiers({
+        query: {}
+      }, function(err, req) {
+        expect(req.query.name).to.equal('Tim');
+      });
+    });
+
+    it('should asynchronously modify params', function() {
+      User.modifyParam('name', function(req, value, next) {
+        async.times(1, function() {
+          next(null, 'Tim');
+        });
+      });
+      User.applyModifiers({
+        query: {}
+      }, function(err, req) {
+        expect(req.query.name).to.equal('Tim');
+      });
+    });
+  });
+
   describe('transforms', function() {
     it('should synchronously transform the document', function(done) {
       User.transform(function(req, doc) {