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

This reverts commit 2d4c680.

Author: tladendo

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

@@ -3,7 +3,7 @@ const mockData = require('../../../tests/test-helpers/mock-data')
 
 /* jshint -W117, -W030 */
 describe('Header Dashboard Controller', function() {
-  var identity
+  var userService, profileService, identity
   var profile = mockData.getMockProfile()
   var stats = mockData.getMockStats()
   var financials = mockData.getMockUserFinancials()
@@ -14,14 +14,45 @@ describe('Header Dashboard Controller', function() {
       '$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()
@@ -30,6 +61,9 @@ describe('Header Dashboard Controller', function() {
     var controller = null
     beforeEach( function(){
       controller = $controller('HeaderDashboardController', {
+        UserService : userService,
+        ProfileService: profileService,
+        userIdentity: identity,
         profile: profile
       })
       $rootScope.$apply()
@@ -41,17 +75,51 @@ describe('Header Dashboard Controller', function() {
     })
   })
 
-  describe('inialization with null profile', function() {
+  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()
+    })
+
+    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 profile endpoint error', 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', {
-        profile: null
+        UserService : userService,
+        ProfileService: profileService,
+        userIdentity: identity,
+        profile: profileService.getUserProfile()
       })
       $rootScope.$apply()
     })
 
     it('variables should be initialized to correct value', function() {
-      expect(controller.profile).to.be.null
+      expect(controller.profile.$$state.status).to.equal(2)
+      expect(controller.profile.$$state.value).to.equal('failed')
     })
   })
 

app/services/externalAccounts.service.js

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