fixing dependencies and the user service unit tests

Author: janmichaelyu

app/templates/ui/app/create/create.controller.spec.js

@@ -8,7 +8,7 @@
     var nextState;
 
     beforeEach(function() {
-      bard.appModule('app.create', 'ngToast');
+      bard.appModule('app.create');
       bard.inject('$controller', '$q', '$rootScope', 'MLRest', '$state', 'userService');
 
       bard.mockService(MLRest, {

app/templates/ui/app/create/create.module.js

@@ -1,5 +1,5 @@
 (function () {
   'use strict';
 
-  angular.module('app.create', ['ml.common', 'app.user']);
+  angular.module('app.create', ['ml.common', 'app.user', 'ngToast']);
 }());

app/templates/ui/app/user/profile.controller.spec.js

@@ -13,7 +13,7 @@
     var currentState;
 
     beforeEach(function() {
-      bard.appModule('app.user', 'ngToast');
+      bard.appModule('app.user');
       bard.inject('$controller', '$q', '$rootScope', 'MLRest', '$state', 'userService');
 
       bard.mockService(MLRest, {

app/templates/ui/app/user/user.module.js

@@ -1,5 +1,5 @@
 (function () {
   'use strict';
 
-  angular.module('app.user', ['ml.common', 'app.login']);
+  angular.module('app.user', ['ml.common', 'app.login', 'ngToast']);
 }());

app/templates/ui/app/user/user.service.spec.js

@@ -1,8 +1,8 @@
 /* jshint -W117, -W030 */
-(function () {
+(function() {
   'use strict';
 
-  describe('Service: userService', function () {
+  describe('Service: userService', function() {
 
     var service;
     var _user = {
@@ -13,7 +13,7 @@
     };
 
     beforeEach(function() {
-      bard.appModule('app.user', 'app');
+      bard.appModule('app.user');
       bard.inject('$q', '$http', '$rootScope', '$state', 'loginService');
 
       bard.mockService($http, {
@@ -39,19 +39,19 @@
 
     });
 
-    beforeEach(inject(function (_userService_) {
+    beforeEach(inject(function(_userService_) {
       service = _userService_;
     }));
 
-    it('should be defined', function () {
+    it('should be defined', function() {
       expect(service).to.be.defined;
     });
 
-    it('currentUser should not be defined', function () {
+    it('currentUser should not be defined', function() {
       expect(service.currentUser()).to.not.be.defined;
     });
 
-    it('should get the current logged in user - if loginService not init', function () {
+    it('should get the current logged in user - if loginService not init', function() {
       service.getUser().then(function(user) {
         expect(user).to.deep.eq(null);
       });
@@ -61,53 +61,27 @@
       $rootScope.$apply();
     });
 
-    // it('should login correctly using loginService', function () {
-    //   $rootScope.$broadcast('loginService:login-success', _user);
-    //   $rootScope.$digest(service);
-
-    //   service.getUser().then(function(user) {
-    //     expect(user).to.deep.eq('bob');
-    //   });
-
-    //   expect(service.updateUser).to.have.been.calledOnce;
-
-    //   $rootScope.$apply();
-    // });
-
-    // it('should set user with valid credentials', function () {
-    //   loginService.login('test', 'abc').then(function(response) {
-    //     expect(response.data).to.deep.eq({ authenticated: true, username: 'bob' });
-    //     expect(service.currentUser()).to.deep.eq({ name: 'bob' });
-    //     expect(service.getUser()).to.deep.eq({ name: 'bob' });
-    //   });
-    //   expect($http.post).to.have.been.calledOnce;
-    //   $rootScope.$apply();
-    // });
-
-    // it('should not set user with invalid credentials', function () {
-    //   _user.data.authenticated = false;
-    //   loginService.login('test', 'abcd').then(function(response) {
-    //     expect(response.data.authenticated).to.be.false;
-    //     expect(service.currentUser()).to.not.be.defined;
-    //   });
-    //   expect($http.post).to.have.been.calledOnce;
-    //   $rootScope.$apply();
-    // });
-
-    // it('should clear user after logout', function () {
-    //   expect(service.currentUser()).to.not.be.defined;
-    //   _user.data.authenticated = true;
-    //   loginService.login('test', 'abcd').then(function(response) {
-    //     expect(response.data).to.deep.eq({ authenticated: true, username: 'bob' });
-    //     expect(service.currentUser()).to.deep.eq({ name: 'bob' });
-
-    //     loginService.logout().then(function(response) {
-    //       expect(loginService.isAuthenticated()).to.be.false;
-    //       expect(service.currentUser()).to.not.be.defined;
-    //     });
-    //   });
-
-    //   $rootScope.$apply();
-    // });
+    it('should update the current user when logged in using loginService', function(done) {
+      $rootScope.$broadcast('loginService:login-success', {data:_user});
+      $rootScope.$apply(service);
+
+      done();
+      expect(service.currentUser().name).to.eq('bob');
+    });
+
+    it('should not set user with invalid credentials', function () {
+      _user.data.authenticated = false;
+      $rootScope.$broadcast('loginService:login-success', {data:_user});
+      $rootScope.$apply(service);
+
+      expect(service.currentUser().name).to.eq(undefined);
+    });
+
+    it('should clear user after logout', function () {
+      $rootScope.$broadcast('loginService:logout-success');
+      $rootScope.$apply(service);
+
+      expect(service.currentUser()).to.not.be.defined;
+    });
   });
 }());