Merge pull request #356 from janmichaelyu/ui-themes-dashboard

unit tests cleanup for gulp build

Author: grtjn

app/templates/bower.json

@@ -22,7 +22,8 @@
     "ng-json-explorer": "8c2a0f9104",
     "vkbeautify-wrapper": "*",
     "highcharts": "^4.2",
-    "angular-google-maps": "2.3.2"
+    "angular-google-maps": "2.3.2",
+    "tinymce-dist": "4.3.12"
   },
   "overrides": {
     "angular-highlightjs": {

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/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 = {
@@ -33,62 +33,55 @@
         }
       });
 
+      bard.mockService(loginService, {
+        getAuthenticatedStatus: $q.when(),
+      });
+
     });
 
-    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({ name: 'bob' });
+        expect(user).to.deep.eq(null);
       });
-      expect($http.get).to.have.been.calledOnce;
+
+      expect(loginService.getAuthenticatedStatus).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 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;
-      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();
+      $rootScope.$broadcast('loginService:login-success', {data:_user});
+      $rootScope.$apply(service);
+
+      expect(service.currentUser().name).to.eq(undefined);
     });
 
     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.$broadcast('loginService:logout-success');
+      $rootScope.$apply(service);
 
-      $rootScope.$apply();
+      expect(service.currentUser()).to.not.be.defined;
     });
   });
 }());

app/themes/map/ui/app/detail/detail.controller.spec.js

@@ -0,0 +1,40 @@
+/* jshint -W117, -W030 */
+(function() {
+  'use strict';
+
+  describe('Controller: DetailCtrl', function() {
+
+    var controller;
+    var doc;
+
+    beforeEach(function() {
+      bard.appModule('app.detail');
+      bard.inject('$controller', '$rootScope', 'MLUiGmapManager', 'uiGmapGoogleMapApi');
+
+      // stub the document
+      var headers = function() {
+        return 'application/json'; };
+      doc = {
+        headers: headers,
+        data: {
+          name: 'hi',
+          location: {
+            latitude: 1,
+            longitude: 2
+          }
+        }
+      };
+      controller = $controller('DetailCtrl', { doc: doc });
+      $rootScope.$apply();
+    });
+
+    it('should be created successfully', function() {
+      expect(controller).to.be.defined;
+    });
+
+    it('should have the doc data we gave it', function() {
+      expect(controller.doc).to.eq(doc.data);
+    });
+
+  });
+}());

app/themes/map/ui/app/detail/detail.module.js

@@ -0,0 +1,10 @@
+(function () {
+  'use strict';
+
+  angular.module('app.detail', [
+    'app.similar',
+    'ui.router',
+    'app.root',
+    'uiGmapgoogle-maps'
+  ]);
+}());

app/themes/map/ui/app/search/search.controller.spec.js

@@ -0,0 +1,71 @@
+/* jshint -W117, -W030 */
+(function() {
+  'use strict';
+
+  describe('Controller: SearchCtrl', function() {
+
+    var controller;
+
+    var currentUser = null;
+
+    var results = [{
+      uri: 'abc',
+      extracted: {
+        content: [{
+          location: {
+            latitude: 1,
+            longitude: 2
+          }
+        }]
+      }
+    }, {
+      uri: 'def',
+      extracted: {
+        content: [{
+          location: {
+            latitude: 1,
+            longitude: 2
+          }
+        }]
+      }
+    }];
+
+    beforeEach(function() {
+      bard.appModule('app.search');
+      bard.inject('$controller', '$q', '$rootScope', '$location',
+        'userService', 'MLSearchFactory', 'MLRest', 'MLUiGmapManager', 'uiGmapGoogleMapApi');
+
+      bard.mockService(userService, {
+        currentUser: $q.when(currentUser)
+      });
+
+      bard.mockService(MLRest, {
+        search: $q.when({
+          data: {
+            results: results
+          }
+        })
+      });
+
+    });
+
+    beforeEach(function() {
+      controller = $controller('SearchCtrl', { $scope: $rootScope.$new() });
+      $rootScope.$apply();
+    });
+
+    it('should be created successfully', function() {
+      expect(controller).to.be.defined;
+    });
+
+    it('should update the current user if it changes', function() {
+      expect(controller.currentUser).to.not.be.defined;
+    });
+
+    it('should run a search', function() {
+      controller.search('stuff');
+      $rootScope.$apply();
+      expect(controller.response.results).to.eq(results);
+    });
+  });
+}());

app/themes/map/ui/app/search/search.module.js

@@ -0,0 +1,9 @@
+(function () {
+  'use strict';
+
+  angular.module('app.search', ['ml.search',
+    'app.user',
+    'app.snippet',
+    'app.root',
+    'uiGmapgoogle-maps']);
+}());