Better test for named parameters

tedeh · Oct 7, 2013 · 7095675 · 7095675
1 parent 53f8f65
commit 7095675
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/lib/server.js b/lib/server.js
@@ -247,7 +247,6 @@ Server.prototype.call = function(request, originalCallback) {
       // pop the last one out because it must be the callback
       parameters.pop();
 
-      // TODO deal with strictness (missing params etc)
       args = parameters.map(function(name) {
         return request.params[name];
       });

diff --git a/test/server.test.js b/test/server.test.js
@@ -175,7 +175,12 @@ describe('jayson server instance', function() {
   describe('named parameters', function() {
 
     var namedParamsRequest = utils.request('add', {b: 2, a: 9});
-    it('should return the expected result', reqShouldBeResult(namedParamsRequest, 9 + 2));
+    it('should return as expected', reqShouldBeResult(namedParamsRequest, 9 + 2));
+
+    var wrongParamsRequest = utils.request('add', {});
+    it('should not fail when not given sufficient arguments', reqShouldBeResult(wrongParamsRequest, function(result) {
+      isNaN(result).should.be.true;
+    }));
 
   });
 
@@ -288,8 +293,8 @@ describe('jayson server instance', function() {
       should.not.exist(err);
       should.exist(res);
       should.exist(res.result);
-      if(typeof(validate) === 'function') validate(res.result);
-      else res.result.should.equal(validate);
+      if(typeof(validate) === 'function') return validate(res.result);
+      res.should.have.property('result', validate);
     });
   }