Merge branch 'release/0.2.0' into production

Author: Miroslav Bajtoš

lib/helpers.js

@@ -142,7 +142,12 @@ _beforeEach.givenAnAnonymousToken = function(attrs, optionalHandler) {
   _beforeEach.givenModel('accessToken', {id: '$anonymous'}, optionalHandler);
 }
 
-_describe.whenCalledRemotely = function(verb, url, cb) {
+_describe.whenCalledRemotely = function(verb, url, data, cb) {
+  if (cb == undefined) {
+    cb = data;
+    data = null;
+  }
+
   var urlStr = url;
   if(typeof url === 'function') {
     urlStr = '/<dynamic>';
@@ -160,17 +165,23 @@ _describe.whenCalledRemotely = function(verb, url, cb) {
       if(methodForVerb === 'delete') methodForVerb = 'del';
 
       this.http = this.request[methodForVerb](this.url);
-      this.url = undefined;
+      delete this.url;
       this.http.set('Accept', 'application/json');
       if(this.loggedInAccessToken) {
         this.http.set('authorization', this.loggedInAccessToken.id);
       }
+      if (data) {
+        var payload = data;
+        if (typeof data === 'function')
+          payload = data.call(this);
+        this.http.send(payload);
+      }
       this.req = this.http.req;
       var test = this;
       this.http.end(function(err) {
         test.req = test.http.req;
         test.res = test.http.res;
-        test.url = undefined;
+        delete test.url;
         cb();
       });
     });
@@ -186,40 +197,43 @@ _describe.whenLoggedInAsUser = function(credentials, cb) {
   });
 }
 
-_describe.whenCalledByUser = function(credentials, verb, url, cb) {
+_describe.whenCalledByUser = function(credentials, verb, url, data, cb) {
   describe('when called by logged in user', function () {
     _beforeEach.givenLoggedInUser(credentials);
-    _describe.whenCalledRemotely(verb, url, cb);
+    _describe.whenCalledRemotely(verb, url, data, cb);
   });
 }
 
-_describe.whenCalledAnonymously = function(verb, url, cb) {
+_describe.whenCalledAnonymously = function(verb, url, data, cb) {
   describe('when called anonymously', function () {
     _beforeEach.givenAnAnonymousToken();
-    _describe.whenCalledRemotely(verb, url, cb);
+    _describe.whenCalledRemotely(verb, url, data, cb);
   });
 }
 
-_describe.whenCalledUnauthenticated = function(verb, url, cb) {
+_describe.whenCalledUnauthenticated = function(verb, url, data, cb) {
   describe('when called with unauthenticated token', function () {
     _beforeEach.givenAnAnonymousToken();
-    _describe.whenCalledRemotely(verb, url, cb);
+    _describe.whenCalledRemotely(verb, url, data, cb);
   });
 }
 
 _it.shouldBeAllowed = function() {
   it('should be allowed', function() {
     assert(this.req);
     assert(this.res);
-    assert.notEqual(this.res.statusCode, 401);
+    // expect success - status 2xx or 3xx
+    expect(this.res.statusCode).to.be.within(100, 399);
   });
 }
 
 _it.shouldBeDenied = function() {
   it('should not be allowed', function() {
     assert(this.res);
-    var status = this.res.statusCode;
-    assert(status === 401 || status === 404);
+    var expectedStatus = this.aclErrorStatus ||
+      this.app && this.app.get('aclErrorStatus') ||
+      401;
+    expect(this.res.statusCode).to.equal(expectedStatus);
   });
 }
 
@@ -231,8 +245,8 @@ _it.shouldNotBeFound = function() {
 }
 
 _it.shouldBeAllowedWhenCalledAnonymously =
-function(verb, url) {
-  _describe.whenCalledAnonymously(verb, url, function() {
+function(verb, url, data) {
+  _describe.whenCalledAnonymously(verb, url, data, function() {
     _it.shouldBeAllowed();
   });
 }
@@ -245,8 +259,8 @@ function(verb, url) {
 }
 
 _it.shouldBeAllowedWhenCalledUnauthenticated =
-function(verb, url) {
-  _describe.whenCalledUnauthenticated(verb, url, function() {
+function(verb, url, data) {
+  _describe.whenCalledUnauthenticated(verb, url, data, function() {
     _it.shouldBeAllowed();
   });
 }
@@ -259,8 +273,8 @@ function(verb, url) {
 }
 
 _it.shouldBeAllowedWhenCalledByUser =
-function(credentials, verb, url) {
-  _describe.whenCalledByUser(credentials, verb, url, function() {
+function(credentials, verb, url, data) {
+  _describe.whenCalledByUser(credentials, verb, url, data, function() {
     _it.shouldBeAllowed();
   });
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "loopback-testing",
-  "version": "0.1.5",
+  "version": "0.2.0",
   "description": "Utilities for testing LoopBack applications",
   "main": "index.js",
   "scripts": {
@@ -10,12 +10,9 @@
   "author": "Ritchie Martori",
   "dependencies": {
     "supertest": "~0.9.0",
-    "mocha": "~1.17.1",
+    "mocha": "~1.20.1",
     "async": "~0.2.10"
   },
-  "peerDependencies": {
-    "loopback": "2.x || ^1.6.1"
-  },
   "devDependencies": {
     "chai": "~1.9.0",
     "loopback": "^1.6.1"