test(admin-users): fix mock modules

Mock modules need to run inside beforeEach blocks otherwise they can overwrite each other if they have the same names.
roneigualberto · Oct 6, 2013 · cca1cb2 · cca1cb2
1 parent f4d3d8d
commit cca1cb2
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 16 deletions.
diff --git a/client/test/unit/app/admin/users/admin-users-edit.spec.js b/client/test/unit/app/admin/users/admin-users-edit.spec.js
@@ -1,7 +1,9 @@
-describe('admin-users-edit', function() 
-{
-  angular.module('mocks', []).value('I18N.MESSAGES', {});
-  beforeEach(module('admin-users-edit', 'mocks'));
+describe('admin-users-edit', function() {
+
+  beforeEach(function() {
+    angular.module('I18N-mock', []).value('I18N.MESSAGES', {});
+  });
+  beforeEach(module('admin-users-edit', 'I18N-mock'));
 
   describe('UsersEditCtrl', function () {
     function createLocals() {

diff --git a/client/test/unit/app/admin/users/admin-users-list.spec.js b/client/test/unit/app/admin/users/admin-users-list.spec.js
@@ -1,13 +1,13 @@
-describe('admin-users-list', function () {
+describe('admin-users-list', function() {
 
-  angular.module('mocks', []).value('I18N.MESSAGES', {});
-  beforeEach(module('admin-users-edit', 'mocks'));
-
-  beforeEach(module('admin-users-list', 'mocks'));
+  beforeEach(function() {
+    angular.module('I18N-mock', []).value('I18N.MESSAGES', {});
+  });
+  beforeEach(module('admin-users-list', 'I18N-mock'));
 
   describe('UsersListCtrl', function () {
 
-    it('should set up the scope correctly', inject(function ($controller) {
+    it('should set up the scope correctly', inject(function($controller) {
       var locals = {
         $scope: {},
         crudListMethods: jasmine.createSpy('crudListMethods'),

diff --git a/client/test/unit/app/admin/users/uniqueEmail.spec.js b/client/test/unit/app/admin/users/uniqueEmail.spec.js
@@ -6,13 +6,15 @@ describe('uniqueEmail directive', function() {
     $scope.$digest();
   }
 
-  // Mockup Users resource
-  angular.module('mocks', []).factory('Users', function() {
-    Users = jasmine.createSpyObj('Users', ['query']);
-    return Users;
+  beforeEach(function() {
+    // Mockup Users resource
+    angular.module('mock-Users', []).factory('Users', function() {
+      Users = jasmine.createSpyObj('Users', ['query']);
+      return Users;
+    });
   });
-
-  beforeEach(module('admin-users-edit-uniqueEmail', 'mocks'));
+  
+  beforeEach(module('admin-users-edit-uniqueEmail', 'mock-Users'));
 
   beforeEach(inject(function($compile, $rootScope){
     $scope = $rootScope;