diff options
| author | Misko Hevery | 2011-02-03 12:55:23 -0800 | 
|---|---|---|
| committer | Misko Hevery | 2011-02-03 20:03:32 -0800 | 
| commit | d35c1ac8b0bcd5df7a978fa2baee40be7ee317f3 (patch) | |
| tree | 8645986434661680371ad43eb160e8f4718b66e9 /test | |
| parent | 2a9f7b7287d622c17fd030eb5dfc9787cf5e6087 (diff) | |
| download | angular.js-d35c1ac8b0bcd5df7a978fa2baee40be7ee317f3.tar.bz2 | |
Fixed notifyWhenNoOutstandingRequests() when using JSONP
Diffstat (limited to 'test')
| -rw-r--r-- | test/BrowserSpecs.js | 12 | 
1 files changed, 8 insertions, 4 deletions
| diff --git a/test/BrowserSpecs.js b/test/BrowserSpecs.js index f0c026ba..96e5a988 100644 --- a/test/BrowserSpecs.js +++ b/test/BrowserSpecs.js @@ -20,16 +20,16 @@ describe('browser', function(){      fakeWindow = {        location: {href:"http://server"},        setTimeout: fakeSetTimeout -    } +    }; -    var fakeBody = {append: function(node){scripts.push(node)}}; +    var fakeBody = {append: function(node){scripts.push(node);}};      var fakeXhr = function(){        xhr = this;        this.open = noop;        this.setRequestHeader = noop;        this.send = noop; -    } +    };      logs = {log:[], warn:[], info:[], error:[]}; @@ -68,15 +68,19 @@ describe('browser', function(){    describe('xhr', function(){      describe('JSON', function(){        it('should add script tag for request', function() { +        var callback = jasmine.createSpy('callback');          var log = "";          browser.xhr('JSON', 'http://example.org/path?cb=JSON_CALLBACK', function(code, data){            log += code + ':' + data + ';';          }); +        browser.notifyWhenNoOutstandingRequests(callback); +        expect(callback).not.wasCalled();          expect(scripts.length).toEqual(1);          var url = scripts[0].src.split('?cb=');          expect(url[0]).toEqual('http://example.org/path');          expect(typeof fakeWindow[url[1]]).toEqual($function);          fakeWindow[url[1]]('data'); +        expect(callback).wasCalled();          expect(log).toEqual('200:data;');          expect(typeof fakeWindow[url[1]]).toEqual('undefined');        }); @@ -388,7 +392,7 @@ describe('browser', function(){        browser = new Browser(fakeWindow, {}, {});        var events = [], -          event = {type: "hashchange"} +          event = {type: "hashchange"};        browser.onHashChange(function(e) {          events.push(e); | 
