feat($httpBackend): extract $browser.xhr into separate service

- remove whole $browser.xhr stuff
- remove whole mock $browser.xhr stuff
- add $httpBackend service + migrate unit tests from $browser
- add temporary API to access $browser's outstandingRequests count

2 files changed, 181 insertions, 195 deletions

diff --git a/test/service/browserSpecs.js b/test/service/browserSpecs.js
index 2ec000f4..4563d14b 100644
--- a/test/service/browserSpecs.js
+++ b/test/service/browserSpecs.js
@@ -48,34 +48,17 @@ function MockWindow() {
 
 describe('browser', function() {
 
-  var browser, fakeWindow, xhr, logs, scripts, removedScripts, sniffer;
+  var browser, fakeWindow, logs, scripts, removedScripts, sniffer;
 
   beforeEach(function() {
     scripts = [];
     removedScripts = [];
-    xhr = null;
     sniffer = {history: true, hashchange: true};
     fakeWindow = new MockWindow();
 
     var fakeBody = [{appendChild: function(node){scripts.push(node);},
                      removeChild: function(node){removedScripts.push(node);}}];
 
-    var FakeXhr = function() {
-      xhr = this;
-      this.open = function(method, url, async){
-        xhr.method = method;
-        xhr.url = url;
-        xhr.async = async;
-        xhr.headers = {};
-      };
-      this.setRequestHeader = function(key, value){
-        xhr.headers[key] = value;
-      };
-      this.send = function(post){
-        xhr.post = post;
-      };
-    };
-
     logs = {log:[], warn:[], info:[], error:[]};
 
     var fakeLog = {log: function() { logs.log.push(slice.call(arguments)); },
@@ -83,8 +66,7 @@ describe('browser', function() {
                    info: function() { logs.info.push(slice.call(arguments)); },
                    error: function() { logs.error.push(slice.call(arguments)); }};
 
-    browser = new Browser(fakeWindow, jqLite(window.document), fakeBody, FakeXhr,
-                          fakeLog, sniffer);
+    browser = new Browser(fakeWindow, jqLite(window.document), fakeBody, fakeLog, sniffer);
   });
 
   it('should contain cookie cruncher', function() {
@@ -97,183 +79,8 @@ describe('browser', function() {
       browser.notifyWhenNoOutstandingRequests(callback);
       expect(callback).toHaveBeenCalled();
     });
-
-    it('should queue callbacks with outstanding requests', function() {
-      var callback = jasmine.createSpy('callback');
-      browser.xhr('GET', '/url', null, noop);
-      browser.notifyWhenNoOutstandingRequests(callback);
-      expect(callback).not.toHaveBeenCalled();
-
-      xhr.readyState = 4;
-      xhr.onreadystatechange();
-      expect(callback).toHaveBeenCalled();
-    });
   });
 
-  describe('xhr', function() {
-    describe('JSONP', function() {
-      var log;
-
-      function callback(code, data) {
-        log += code + ':' + data + ';';
-      }
-
-      beforeEach(function() {
-        log = "";
-      });
-
-
-      // We don't have unit tests for IE because script.readyState is readOnly.
-      // Instead we run e2e tests on all browsers - see e2e for $http.
-      if (!msie) {
-
-        it('should add script tag for JSONP request', function() {
-          var notify = jasmine.createSpy('notify');
-          browser.xhr('JSONP', 'http://example.org/path?cb=JSON_CALLBACK', null, callback);
-          browser.notifyWhenNoOutstandingRequests(notify);
-          expect(notify).not.toHaveBeenCalled();
-          expect(scripts.length).toEqual(1);
-          var script = scripts[0];
-          var url = script.src.split('?cb=');
-          expect(url[0]).toEqual('http://example.org/path');
-          expect(typeof fakeWindow[url[1]]).toEqual('function');
-          fakeWindow[url[1]]('data');
-          script.onload();
-
-          expect(notify).toHaveBeenCalled();
-          expect(log).toEqual('200:data;');
-          expect(scripts).toEqual(removedScripts);
-          expect(fakeWindow[url[1]]).toBeUndefined();
-        });
-
-
-        it('should call callback with status -2 when script fails to load', function() {
-          browser.xhr('JSONP', 'http://example.org/path?cb=JSON_CALLBACK', null, callback);
-          var script = scripts[0];
-          expect(typeof script.onload).toBe('function');
-          expect(typeof script.onerror).toBe('function');
-          script.onerror();
-
-          expect(log).toEqual('-2:undefined;');
-        });
-
-
-        it('should update the outstandingRequests counter for successful requests', function() {
-          var notify = jasmine.createSpy('notify');
-          browser.xhr('JSONP', 'http://example.org/path?cb=JSON_CALLBACK', null, callback);
-          browser.notifyWhenNoOutstandingRequests(notify);
-          expect(notify).not.toHaveBeenCalled();
-
-          var script = scripts[0];
-          var url = script.src.split('?cb=');
-          fakeWindow[url[1]]('data');
-          script.onload();
-
-          expect(notify).toHaveBeenCalled();
-        });
-
-
-        it('should update the outstandingRequests counter for failed requests', function() {
-          var notify = jasmine.createSpy('notify');
-          browser.xhr('JSONP', 'http://example.org/path?cb=JSON_CALLBACK', null, callback);
-          browser.notifyWhenNoOutstandingRequests(notify);
-          expect(notify).not.toHaveBeenCalled();
-
-          scripts[0].onerror();
-
-          expect(notify).toHaveBeenCalled();
-        });
-      }
-    });
-
-
-    it('should normalize IE\'s 1223 status code into 204', function() {
-      var callback = jasmine.createSpy('XHR');
-
-      browser.xhr('GET', 'URL', 'POST', callback);
-
-      xhr.status = 1223;
-      xhr.readyState = 4;
-      xhr.onreadystatechange();
-
-      expect(callback).toHaveBeenCalled();
-      expect(callback.argsForCall[0][0]).toEqual(204);
-    });
-
-    it('should set only the requested headers', function() {
-      var code, response, headers = {};
-      browser.xhr('POST', 'URL', null, function(c,r){
-        code = c;
-        response = r;
-      }, {'X-header1': 'value1', 'X-header2': 'value2'});
-
-      expect(xhr.method).toEqual('POST');
-      expect(xhr.url).toEqual('URL');
-      expect(xhr.post).toEqual('');
-      expect(xhr.headers).toEqual({
-        "X-header1":"value1",
-        "X-header2":"value2"
-      });
-
-      xhr.status = 202;
-      xhr.responseText = 'RESPONSE';
-      xhr.readyState = 4;
-      xhr.onreadystatechange();
-
-      expect(code).toEqual(202);
-      expect(response).toEqual('RESPONSE');
-    });
-
-    it('should return raw xhr object', function() {
-      expect(browser.xhr('GET', '/url', null, noop)).toBe(xhr);
-    });
-
-    it('should abort request on timeout', function() {
-      var callback = jasmine.createSpy('done').andCallFake(function(status, response) {
-        expect(status).toBe(-1);
-      });
-
-      browser.xhr('GET', '/url', null, callback, {}, 2000);
-      xhr.abort = jasmine.createSpy('xhr.abort');
-
-      fakeWindow.setTimeout.flush();
-      expect(xhr.abort).toHaveBeenCalledOnce();
-
-      xhr.status = 0;
-      xhr.readyState = 4;
-      xhr.onreadystatechange();
-      expect(callback).toHaveBeenCalledOnce();
-    });
-
-    it('should be async even if xhr.send() is sync', function() {
-      // IE6, IE7 is sync when serving from cache
-      var xhr;
-      function FakeXhr() {
-        xhr = this;
-        this.open = this.setRequestHeader = noop;
-        this.send = function() {
-          this.status = 200;
-          this.responseText = 'response';
-          this.readyState = 4;
-        };
-      }
-
-      var callback = jasmine.createSpy('done').andCallFake(function(status, response) {
-        expect(status).toBe(200);
-        expect(response).toBe('response');
-      });
-
-      browser = new Browser(fakeWindow, jqLite(window.document), null, FakeXhr, null);
-      browser.xhr('GET', '/url', null, callback);
-      expect(callback).not.toHaveBeenCalled();
-
-      fakeWindow.setTimeout.flush();
-      expect(callback).toHaveBeenCalledOnce();
-
-      (xhr.onreadystatechange || noop)();
-      expect(callback).toHaveBeenCalledOnce();
-    });
-  });
 
   describe('defer', function() {
     it('should execute fn asynchroniously via setTimeout', function() {
diff --git a/test/service/httpBackendSpec.js b/test/service/httpBackendSpec.js
new file mode 100644
index 00000000..e609eea6
--- /dev/null
+++ b/test/service/httpBackendSpec.js
@@ -0,0 +1,179 @@
+describe('$httpBackend', function() {
+
+  var $backend, $browser, $window,
+      xhr, fakeBody, callback;
+
+  // TODO(vojta): should be replaced by $defer mock
+  function fakeTimeout(fn, delay) {
+    fakeTimeout.fns.push(fn);
+    fakeTimeout.delays.push(delay);
+  }
+
+  fakeTimeout.fns = [];
+  fakeTimeout.delays = [];
+  fakeTimeout.flush = function() {
+    var len = fakeTimeout.fns.length;
+    fakeTimeout.delays = [];
+    while (len--) fakeTimeout.fns.shift()();
+  };
+
+
+  beforeEach(inject(function($injector) {
+    $window = {};
+    $browser = $injector.get('$browser');
+    fakeBody = {removeChild: jasmine.createSpy('body.removeChild')};
+    $backend = createHttpBackend($browser, MockXhr, fakeTimeout, $window, fakeBody);
+    callback = jasmine.createSpy('done');
+  }));
+
+
+  it('should do basics - open async xhr and send data', function() {
+    $backend('GET', '/some-url', 'some-data', noop);
+    xhr = MockXhr.$$lastInstance;
+
+    expect(xhr.$$method).toBe('GET');
+    expect(xhr.$$url).toBe('/some-url');
+    expect(xhr.$$data).toBe('some-data');
+    expect(xhr.$$async).toBe(true);
+  });
+
+
+  it('should normalize IE\'s 1223 status code into 204', function() {
+    callback.andCallFake(function(status) {
+      expect(status).toBe(204);
+    });
+
+    $backend('GET', 'URL', null, callback);
+    xhr = MockXhr.$$lastInstance;
+
+    xhr.status = 1223;
+    xhr.readyState = 4;
+    xhr.onreadystatechange();
+
+    expect(callback).toHaveBeenCalledOnce();
+  });
+
+
+  it('should set only the requested headers', function() {
+    $backend('POST', 'URL', null, noop, {'X-header1': 'value1', 'X-header2': 'value2'});
+    xhr = MockXhr.$$lastInstance;
+
+    expect(xhr.$$headers).toEqual({
+      'X-header1': 'value1',
+      'X-header2': 'value2'
+    });
+  });
+
+
+  it('should return raw xhr object', function() {
+    expect($backend('GET', '/url', null, noop)).toBe(MockXhr.$$lastInstance);
+  });
+
+
+  it('should abort request on timeout', function() {
+    callback.andCallFake(function(status, response) {
+      expect(status).toBe(-1);
+    });
+
+    $backend('GET', '/url', null, callback, {}, 2000);
+    xhr = MockXhr.$$lastInstance;
+    spyOn(xhr, 'abort');
+
+    expect(fakeTimeout.delays[0]).toBe(2000);
+
+    fakeTimeout.flush();
+    expect(xhr.abort).toHaveBeenCalledOnce();
+
+    xhr.status = 0;
+    xhr.readyState = 4;
+    xhr.onreadystatechange();
+    expect(callback).toHaveBeenCalledOnce();
+  });
+
+
+  it('should be async even if xhr.send() is sync', function() {
+    // IE6, IE7 is sync when serving from cache
+    function SyncXhr() {
+      xhr = this;
+      this.open = this.setRequestHeader = noop;
+      this.send = function() {
+        this.status = 200;
+        this.responseText = 'response';
+        this.readyState = 4;
+      };
+    }
+
+    callback.andCallFake(function(status, response) {
+      expect(status).toBe(200);
+      expect(response).toBe('response');
+    });
+
+    $backend = createHttpBackend($browser, SyncXhr, fakeTimeout);
+    $backend('GET', '/url', null, callback);
+    expect(callback).not.toHaveBeenCalled();
+
+    fakeTimeout.flush();
+    expect(callback).toHaveBeenCalledOnce();
+
+    (xhr.onreadystatechange || noop)();
+    expect(callback).toHaveBeenCalledOnce();
+  });
+
+
+  describe('JSONP', function() {
+
+    it('should add script tag for JSONP request', function() {
+      callback.andCallFake(function(status, response) {
+        expect(status).toBe(200);
+        expect(response).toBe('some-data');
+      });
+
+      $backend('JSONP', 'http://example.org/path?cb=JSON_CALLBACK', null, callback);
+      expect($browser.$$scripts.length).toBe(1);
+
+      var script = $browser.$$scripts.shift(),
+          url = script.url.split('?cb=');
+
+      expect(url[0]).toBe('http://example.org/path');
+      $window[url[1]]('some-data');
+      script.done();
+
+      expect(callback).toHaveBeenCalledOnce();
+    });
+
+
+    it('should clean up the callback and remove the script', function() {
+      $backend('JSONP', 'http://example.org/path?cb=JSON_CALLBACK', null, callback);
+      expect($browser.$$scripts.length).toBe(1);
+
+      var script = $browser.$$scripts.shift(),
+          callbackId = script.url.split('?cb=')[1];
+
+      $window[callbackId]('some-data');
+      script.done();
+
+      expect($window[callbackId]).toBeUndefined();
+      expect(fakeBody.removeChild).toHaveBeenCalledOnce();
+      expect(fakeBody.removeChild).toHaveBeenCalledWith(script);
+    });
+
+
+    it('should call callback with status -2 when script fails to load', function() {
+      callback.andCallFake(function(status, response) {
+        expect(status).toBe(-2);
+        expect(response).toBeUndefined();
+      });
+
+      $backend('JSONP', 'http://example.org/path?cb=JSON_CALLBACK', null, callback);
+      expect($browser.$$scripts.length).toBe(1);
+
+      $browser.$$scripts.shift().done();
+      expect(callback).toHaveBeenCalledOnce();
+    });
+
+
+    // TODO(vojta): test whether it fires "async-start"
+    // TODO(vojta): test whether it fires "async-end" on both success and error
+  });
+});
+