Merge pull request iGLOO-be#2 from LoicMahieu/fix/1

Save created models in closure

Author: LoicMahieu

lib/helpers.js

@@ -77,22 +77,18 @@ _beforeEach.withArgs = function() {
 }
 
 _beforeEach.givenModel = function(modelName, attrs, optionalHandler) {
-  var modelKey = modelName;
+  var modelInstance;
 
   if(typeof attrs === 'function') {
     optionalHandler = attrs;
     attrs = undefined;
   }
 
-  if(typeof optionalHandler === 'string') {
-    modelKey = optionalHandler;
-  }
-
   attrs = attrs || {};
 
   beforeEach(function(done) {
     if(modelName === '__USERMODEL__') {
-      modelName = this.userModel ? this.userModel : 'user';
+      modelName = this.userModel ? this.userModel : 'User';
     }
 
     var test = this;
@@ -112,7 +108,15 @@ _beforeEach.givenModel = function(modelName, attrs, optionalHandler) {
         if(err.details) console.error(err.details);
         done(err);
       } else {
+        var modelKey = modelName;
+        if(typeof optionalHandler === 'string') {
+          modelKey = optionalHandler;
+        }
+
+        test['__USERMODEL__'] = result;
         test[modelKey] = result;
+        modelInstance = result;
+
         done();
       }
     });
@@ -123,7 +127,7 @@ _beforeEach.givenModel = function(modelName, attrs, optionalHandler) {
   }
 
   afterEach(function(done) {
-    this[modelKey].destroy(done);
+    modelInstance.destroy(done);
   });
 }
 
@@ -139,21 +143,25 @@ _beforeEach.givenUser = function(attrs, optionalHandler) {
 }
 
 _beforeEach.givenUserWithRole = function (attrs, role, optionalHandler) {
+  var roleInstance, roleMappingInstance;
+
   if (typeof role === 'string') {
     role = {
       name: role
     }
   }
   _beforeEach.givenUser(attrs, function (done) {
     var test = this;
-    test.app.models.Role.findOrCreate({name: role.name }, function (err, result) {
+    test.app.models.Role.findOrCreate(role, function (err, result) {
       if(err) {
         console.error(err.message);
         if(err.details) console.error(err.details);
         return done(err);
       }
 
       test.userRole = result;
+      roleInstance = result;
+
       test.app.models.RoleMapping.create(
         {principalId: test.__USERMODEL__.id,
          principalType: test.app.models.RoleMapping.USER,
@@ -166,6 +174,8 @@ _beforeEach.givenUserWithRole = function (attrs, role, optionalHandler) {
           }
 
           test.userRoleMapping = result;
+          roleMappingInstance = result;
+
           done();
         }
       );
@@ -177,14 +187,13 @@ _beforeEach.givenUserWithRole = function (attrs, role, optionalHandler) {
   }
 
   afterEach(function(done) {
-    var test = this;
-    this.userRole.destroy(function(err) {
+    roleInstance.destroy(function(err) {
       if(err) return done(err);
-      test.userRole = undefined;
+      roleInstance = undefined;
 
-      test.userRoleMapping.destroy(function(err) {
+      roleMappingInstance.destroy(function(err) {
         if(err) return done(err);
-        test.userRoleMapping = undefined;
+        roleMappingInstance = undefined;
         done();
       });
     });

test/test.js

@@ -6,6 +6,9 @@ describe('helpers', function () {
   var testApp = loopback();
   var db = testApp.dataSource('db', {connector: loopback.Memory});
   var testModel = testApp.model('xxx-test-model', {dataSource: 'db'});
+  testApp.model(loopback.User, {dataSource: 'db'});
+  testApp.model(loopback.Role, {dataSource: 'db'});
+  testApp.model(loopback.RoleMapping, {dataSource: 'db'});
 
   testApp.use(loopback.rest());
   helpers.beforeEach.withApp(testApp);
@@ -109,4 +112,50 @@ describe('helpers', function () {
       });
     });
   });
+
+ describe('givenUserWithRole', function() {
+   describe('role as string', function () {
+     helpers.beforeEach.givenUserWithRole(
+       {id: 1, email: "[email protected]", password: "abc"},
+       "testRole");
+     it("should create a user instance with default userModel with the given role", function() {
+       assert.equal(this['User'].id, 1);
+       assert.equal(this.userRole.id, 1);
+       assert.equal(this.userRole.name, "testRole");
+       assert(this.userRoleMapping);
+     });
+   })
+   describe('role as object', function () {
+     helpers.beforeEach.givenUserWithRole(
+       {id: 1, email: "[email protected]", password: "abc"},
+       {id: 2, name: "testRole"});
+     it("should create a user instance with default userModel with the given role", function() {
+       assert.equal(this['User'].id, 1);
+       assert.equal(this.userRole.id, 2);
+       assert.equal(this.userRole.name, "testRole");
+       assert(this.userRoleMapping);
+     });
+   })
+ });
+ describe('withUserModel', function() {
+   helpers.beforeEach.withUserModel('xxx-test-model');
+   it("should set the user model name", function() {
+     assert.equal(this.userModel, 'xxx-test-model');
+   });
+   describe('givenUser', function() {
+     helpers.beforeEach.givenUser();
+     it("should create a new instance of specified User model", function() {
+       assert(this[this.userModel]);
+     });
+   });
+   describe('givenUserWithRole', function() {
+     helpers.beforeEach.givenUserWithRole({id: 1}, {id: 2, name: "testRole"});
+     it("should create a user instance (of specified User model) with the given role", function() {
+       assert.equal(this[this.userModel].id, 1);
+       assert.equal(this.userRole.id, 2);
+       assert.equal(this.userRole.name, "testRole");
+       assert(this.userRoleMapping);
+     });
+   });
+ });
 });