Merge branch 'release/1.0.0' into production

Author: Miroslav Bajtoš

lib/helpers.js

@@ -8,6 +8,7 @@ var helpers = exports = module.exports = {
 };
 var assert = require('assert');
 var request = require('supertest');
+var expect = require('chai').expect;
 
 _beforeEach.withApp = function(app) {
   if (app.models.User) {
@@ -109,6 +110,54 @@ _beforeEach.givenModel = function(modelName, attrs, optionalHandler) {
 
 _beforeEach.givenUser = function(attrs, optionalHandler) {
   _beforeEach.givenModel('user', attrs, optionalHandler);
+} 
+
+_beforeEach.givenUserWithRole = function (attrs, role, optionalHandler) {
+  _beforeEach.givenUser(attrs, function (done) {
+    var test = this;
+    test.app.models.Role.create({name: role}, function (err, result) {
+      if(err) {
+        console.error(err.message);
+        if(err.details) console.error(err.details);
+        return done(err);
+      }
+
+      test.userRole = result;
+      test.app.models.roleMapping.create(
+        {principalId: test.user.id,
+         principalType: test.app.models.roleMapping.USER,
+         roleId: result.id},
+        function (err, result) {
+          if(err) {
+            console.error(err.message);
+            if(err.details) console.error(err.details);
+            return done(err);
+          }
+    
+          test.userRoleMapping = result;
+          done();
+        }
+      );
+    });
+  });
+
+  if(typeof optionalHandler === 'function') {
+    beforeEach(optionalHandler);
+  }
+
+  afterEach(function(done) {
+    var test = this;
+    this.userRole.destroy(function(err) {
+      if(err) return done(err);
+      test.userRole = undefined;
+
+      test.userRoleMapping.destroy(function(err) {
+        if(err) return done(err);
+        test.userRoleMapping = undefined;
+        done();
+      });
+    });
+  });
 }
 
 _beforeEach.givenLoggedInUser = function(credentials, optionalHandler) {
@@ -134,6 +183,29 @@ _beforeEach.givenLoggedInUser = function(credentials, optionalHandler) {
   });
 }
 
+_beforeEach.givenLoggedInUserWithRole = function(credentials, role, optionalHandler){
+  _beforeEach.givenUserWithRole(credentials, role, function(done) {
+    var test = this;
+    this.user.constructor.login(credentials, function(err, token) {
+      if(err) {
+        done(err);
+      } else {
+        test.loggedInAccessToken = token;
+        done();
+      }
+    });
+  });
+
+  afterEach(function(done) {
+    var test = this;
+    this.loggedInAccessToken.destroy(function(err) {
+      if(err) return done(err);
+      test.loggedInAccessToken = undefined;
+      done();
+    });
+  });
+}
+
 _beforeEach.givenAnUnauthenticatedToken = function(attrs, optionalHandler) {
   _beforeEach.givenModel('accessToken', attrs, optionalHandler);
 }
@@ -197,13 +269,27 @@ _describe.whenLoggedInAsUser = function(credentials, cb) {
   });
 }
 
+_describe.whenLoggedInAsUserWithRole = function(credentials, role, cb) {
+  describe('when logged in as user', function () {
+    _beforeEach.givenLoggedInUser(credentials, role);
+    cb();
+  });
+}
+
 _describe.whenCalledByUser = function(credentials, verb, url, data, cb) {
   describe('when called by logged in user', function () {
     _beforeEach.givenLoggedInUser(credentials);
     _describe.whenCalledRemotely(verb, url, data, cb);
   });
 }
 
+_describe.whenCalledByUserWithRole = function (credentials, role, verb, url, data, cb) {
+   describe('when called by logged in user with role ' + role, function () {
+    _beforeEach.givenLoggedInUserWithRole(credentials, role);
+    _describe.whenCalledRemotely(verb, url, data, cb);
+  }); 
+}
+
 _describe.whenCalledAnonymously = function(verb, url, data, cb) {
   describe('when called anonymously', function () {
     _beforeEach.givenAnAnonymousToken();
@@ -285,3 +371,17 @@ function(credentials, verb, url) {
     _it.shouldBeDenied();
   });
 }
+
+_it.shouldBeAllowedWhenCalledByUserWithRole =
+function(credentials, role, verb, url, data) {
+  _describe.whenCalledByUserWithRole(credentials, role, verb, url, data, function() {
+    _it.shouldBeAllowed();
+  });
+}
+
+_it.shouldBeDeniedWhenCalledByUserWithRole =
+function(credentials, role, verb, url) {
+  _describe.whenCalledByUserWithRole(credentials, role, verb, url, function() {
+    _it.shouldBeDenied();
+  });
+}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "loopback-testing",
-  "version": "0.2.1",
+  "version": "1.0.0",
   "description": "Utilities for testing LoopBack applications",
   "main": "index.js",
   "scripts": {
@@ -9,13 +9,13 @@
   "repository": "",
   "author": "Ritchie Martori",
   "dependencies": {
-    "supertest": "~0.9.0",
-    "mocha": "~1.20.1",
-    "async": "~0.2.10"
+    "supertest": "~0.13.0",
+    "mocha": "~1.21.4",
+    "async": "~0.9.0"
   },
   "devDependencies": {
     "chai": "~1.9.0",
-    "loopback": "^1.6.1"
+    "loopback": "^2.2.0"
   },
   "repository": {
     "type": "git",