Merge pull request #921 from appirio-tech/feature/fix_unit_tests

Github issue #919, Few Unit tests failing after angular 1.6.x release

Author: vikasrohit

app/my-dashboard/header-dashboard/header-dashboard.spec.js

@@ -3,56 +3,15 @@ const mockData = require('../../../tests/test-helpers/mock-data')
 
 /* jshint -W117, -W030 */
 describe('Header Dashboard Controller', function() {
-  var userService, profileService, identity
   var profile = mockData.getMockProfile()
-  var stats = mockData.getMockStats()
-  var financials = mockData.getMockUserFinancials()
 
   beforeEach(function() {
     bard.appModule('topcoder')
     bard.inject(this,
       '$controller',
       '$rootScope',
       '$q',
-      'UserService',
-      'ProfileService',
       'Helpers')
-
-    userService = UserService
-    profileService = ProfileService
-
-    identity = function() {
-      return {
-        handle: 'albertwang',
-        userId: 123456
-      }
-    }
-
-    // mock user api
-    sinon.stub(userService, 'getUserIdentity', function() {
-      return {
-        userId: 1234567,
-        handle: 'ut',
-        email: '[email protected]'
-      }
-    })
-
-    // mock profile api
-    sinon.stub(profileService, 'getUserProfile', function(handle) {
-      var deferred = $q.defer()
-      deferred.resolve(profile)
-      return deferred.promise
-    })
-    sinon.stub(profileService, 'getUserStats', function(handle) {
-      var deferred = $q.defer()
-      deferred.resolve(stats)
-      return deferred.promise
-    })
-    sinon.stub(profileService, 'getUserFinancials', function(handle) {
-      var deferred = $q.defer()
-      deferred.resolve(financials)
-      return deferred.promise
-    })
   })
 
   bard.verifyNoOutstandingHttpRequests()
@@ -61,33 +20,6 @@ describe('Header Dashboard Controller', function() {
     var controller = null
     beforeEach( function(){
       controller = $controller('HeaderDashboardController', {
-        UserService : userService,
-        ProfileService: profileService,
-        userIdentity: identity,
-        profile: profile
-      })
-      $rootScope.$apply()
-    })
-
-    it('variables should be initialized to correct value', function() {
-      expect(controller.profile).to.exist
-      expect(controller.profile.handle).to.equal('albertwang')
-    })
-  })
-
-  describe('inialization with profile api stats endpoint error', function() {
-    var controller = null
-    beforeEach( function(){
-      profileService.getUserStats.restore()
-      sinon.stub(profileService, 'getUserStats', function(handle) {
-        var deferred = $q.defer()
-        deferred.reject('failed')
-        return deferred.promise
-      })
-      controller = $controller('HeaderDashboardController', {
-        UserService : userService,
-        ProfileService: profileService,
-        userIdentity: identity,
         profile: profile
       })
       $rootScope.$apply()
@@ -99,27 +31,17 @@ describe('Header Dashboard Controller', function() {
     })
   })
 
-  describe('inialization with profile api profile endpoint error', function() {
+  describe('inialization with null profile', function() {
     var controller = null
     beforeEach( function(){
-      profileService.getUserProfile.restore()
-      sinon.stub(profileService, 'getUserProfile', function(handle) {
-        var deferred = $q.defer()
-        deferred.reject('failed')
-        return deferred.promise
-      })
       controller = $controller('HeaderDashboardController', {
-        UserService : userService,
-        ProfileService: profileService,
-        userIdentity: identity,
-        profile: profileService.getUserProfile()
+        profile: null
       })
       $rootScope.$apply()
     })
 
     it('variables should be initialized to correct value', function() {
-      expect(controller.profile.$$state.status).to.equal(2)
-      expect(controller.profile.$$state.value).to.equal('failed')
+      expect(controller.profile).to.be.null
     })
   })
 

app/services/externalAccounts.service.js

@@ -194,7 +194,7 @@ import _ from 'lodash'
         } else {
           logger.error('Unsupported social login backend', provider)
 
-          $q.reject({
+          reject({
             status: 'failed',
             'error': 'Unsupported social login backend \'' + provider + '\''
           })