diff options
| author | Igor Minar | 2011-10-22 21:32:16 -0700 | 
|---|---|---|
| committer | Igor Minar | 2011-10-22 21:32:48 -0700 | 
| commit | bacc31bea968a505b52889630e4bf578b18ff996 (patch) | |
| tree | 0d8491ec44c1a70b139af3f45cfd474a9b20188a | |
| parent | ad90c3574f8365ee4a1a973d5e43c64fe9fcda2c (diff) | |
| download | angular.js-bacc31bea968a505b52889630e4bf578b18ff996.tar.bz2 | |
fix(defer.cancel): should return false instead of undefined
| -rw-r--r-- | src/Browser.js | 1 | ||||
| -rw-r--r-- | src/angular-mocks.js | 2 | ||||
| -rw-r--r-- | test/BrowserSpecs.js | 5 | ||||
| -rw-r--r-- | test/service/deferSpec.js | 2 | 
4 files changed, 7 insertions, 3 deletions
| diff --git a/src/Browser.js b/src/Browser.js index 9045c2b2..71252050 100644 --- a/src/Browser.js +++ b/src/Browser.js @@ -404,6 +404,7 @@ function Browser(window, document, body, XHR, $log, $sniffer) {        completeOutstandingRequest(noop);        return true;      } +    return false;    }; diff --git a/src/angular-mocks.js b/src/angular-mocks.js index aabbf9ce..679a78a3 100644 --- a/src/angular-mocks.js +++ b/src/angular-mocks.js @@ -285,6 +285,8 @@ function MockBrowser() {        self.deferredFns.splice(fnIndex, 1);        return true;      } + +    return false;    }; diff --git a/test/BrowserSpecs.js b/test/BrowserSpecs.js index 511bb643..5234f0be 100644 --- a/test/BrowserSpecs.js +++ b/test/BrowserSpecs.js @@ -266,10 +266,11 @@ describe('browser', function() {              deferId3 = browser.defer(function() { log.push('cancel me, now!'); });          expect(log).toEqual([]); -        browser.defer.cancel(deferId1); -        browser.defer.cancel(deferId3); +        expect(browser.defer.cancel(deferId1)).toBe(true); +        expect(browser.defer.cancel(deferId3)).toBe(true);          fakeWindow.setTimeout.flush();          expect(log).toEqual(['ok']); +        expect(browser.defer.cancel(deferId2)).toBe(false);        });      });    }); diff --git a/test/service/deferSpec.js b/test/service/deferSpec.js index 117ddc27..ff48c93e 100644 --- a/test/service/deferSpec.js +++ b/test/service/deferSpec.js @@ -114,7 +114,7 @@ describe('$defer', function() {        $browser.defer.flush();        token2 = $defer(task2); -      expect($defer.cancel(token1)).toBeFalsy(); +      expect($defer.cancel(token1)).toBe(false);        expect($defer.cancel(token2)).toBe(true);      });    }); | 
