Merge remote-tracking branch 'origin/master'

sahat · Oct 27, 2014 · 6907160 · 6907160
2 parents 5c03c17 + 16f8600
commit 6907160
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 23 deletions.
diff --git a/test/config.spec.js b/test/config.spec.js
@@ -30,9 +30,13 @@ describe('satellizer.config', function() {
   });
 
   it('should set authHeader', function() {
+    var configDefault = this.$authProvider.authHeader;
+
     this.$authProvider.authHeader = 'x-new-header';
     expect(this.config.authHeader).toEqual('x-new-header');
     expect(this.$authProvider.authHeader).toEqual('x-new-header');
+
+    this.$authProvider.authHeader = configDefault;
   });
 
   it('should get loginOnSignup', function() {

diff --git a/test/http.spec.js b/test/http.spec.js
@@ -1,60 +1,72 @@
 describe('$http', function() {
 
   beforeEach(function() {
-    var _this = this;
+    var self = this;
     module('satellizer', function($authProvider) {
-      _this.$authProvider = $authProvider;
+      self.$authProvider = $authProvider;
     });
   });
 
   beforeEach(inject([
+    '$http',
     '$httpBackend',
-    '$auth',
+    '$window',
     'satellizer.config',
     'satellizer.local',
-    function($httpBackend, $auth, config, local) {
+    'satellizer.shared',
+    function($http, $httpBackend, $window, config, local, shared) {
       var mockResponse = {};
 
+      this.$http = $http;
       this.$httpBackend = $httpBackend;
-      this.$auth = $auth;
+      this.$window = $window;
       this.config = config;
       this.local = local;
+      this.shared = shared;
+
+      $window.localStorage.clear();
 
       mockResponse[this.config.tokenName] = 'ABCDEFG123456';
       $httpBackend.expectPOST(this.config.loginUrl).respond(mockResponse);
     }]));
 
   it('should handle the default Authorization header', function() {
     var self = this;
-    this.$authProvider.authHeader = 'Authorization';
+
     this.local.login()
-      .then(function(response) {
-        return response.config.headers;
-      })
-      .then(function(headers) {
-        var token = headers[self.config.authHeader];
-        expect(token).toBeDefined();
-        expect(token).toMatch(/Bearer\s+\w+/);
-      });
+    this.$httpBackend.flush()
+
+    this.$httpBackend.expectGET('/some/arbitrary/endpoint', function(headers) {
+      var token = headers[self.config.authHeader];
+      expect(token).toBeDefined();
+      expect(token).toMatch(/Bearer\s+\w+/);
+      return headers;
+    }).respond(200);
 
+    this.$http.get('/some/arbitrary/endpoint');
     this.$httpBackend.flush();
   });
 
   it('should handle a custom header', function() {
-    var _this = this;
+    var self = this;
     this.$authProvider.authHeader = 'x-new-header';
+
     this.local.login()
-      .then(function(response) {
-        return response.config.headers;
-      })
-      .then(function(headers) {
-        var token = headers[_this.config.authHeader];
-        expect(token).toBeDefined();
-        expect(token).not.toMatch(/Bearer\s+\w+/);
-      });
+    this.$httpBackend.flush()
 
+    this.$httpBackend.expectGET('/some/arbitrary/endpoint', function(headers) {
+      var token = headers[self.config.authHeader];
+      expect(token).toBeDefined();
+      expect(token).not.toMatch(/Bearer\s+\w+/);
+      return headers;
+    }).respond(200);
+
+    this.$http.get('/some/arbitrary/endpoint');
     this.$httpBackend.flush();
+  });
 
+  afterEach(function() {
+    this.shared.logout();
     this.$authProvider.authHeader = 'Authorization';
   });