Save created models in closure to allow calling given(User|Model) multiple times in the same test

Fix iGLOO-be#1

Author: LoicMahieu

lib/helpers.js

@@ -78,6 +78,7 @@ _beforeEach.withArgs = function() {
 
 _beforeEach.givenModel = function(modelName, attrs, optionalHandler) {
   var modelKey = modelName;
+  var modelInstance;
 
   if(typeof attrs === 'function') {
     optionalHandler = attrs;
@@ -113,6 +114,7 @@ _beforeEach.givenModel = function(modelName, attrs, optionalHandler) {
         done(err);
       } else {
         test[modelKey] = result;
+        modelInstance = result;
         done();
       }
     });
@@ -123,7 +125,7 @@ _beforeEach.givenModel = function(modelName, attrs, optionalHandler) {
   }
 
   afterEach(function(done) {
-    this[modelKey].destroy(done);
+    modelInstance.destroy(done);
   });
 }
 
@@ -139,6 +141,8 @@ _beforeEach.givenUser = function(attrs, optionalHandler) {
 }
 
 _beforeEach.givenUserWithRole = function (attrs, role, optionalHandler) {
+  var roleInstance, roleMappingInstance;
+
   if (typeof role === 'string') {
     role = {
       name: role
@@ -154,6 +158,8 @@ _beforeEach.givenUserWithRole = function (attrs, role, optionalHandler) {
       }
 
       test.userRole = result;
+      roleInstance = result;
+
       test.app.models.RoleMapping.create(
         {principalId: test.__USERMODEL__.id,
          principalType: test.app.models.RoleMapping.USER,
@@ -166,6 +172,8 @@ _beforeEach.givenUserWithRole = function (attrs, role, optionalHandler) {
           }
 
           test.userRoleMapping = result;
+          roleMappingInstance = result;
+
           done();
         }
       );
@@ -177,14 +185,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();
       });
     });