mirror of
https://github.com/Hopiu/angular.js.git
synced 2026-03-19 08:00:23 +00:00
fix(defer.cancel): should return false instead of undefined
This commit is contained in:
parent
ad90c3574f
commit
bacc31bea9
4 changed files with 7 additions and 3 deletions
|
|
@ -404,6 +404,7 @@ function Browser(window, document, body, XHR, $log, $sniffer) {
|
|||
completeOutstandingRequest(noop);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
};
|
||||
|
||||
|
||||
|
|
|
|||
2
src/angular-mocks.js
vendored
2
src/angular-mocks.js
vendored
|
|
@ -285,6 +285,8 @@ function MockBrowser() {
|
|||
self.deferredFns.splice(fnIndex, 1);
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
};
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
});
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
});
|
||||
});
|
||||
|
|
|
|||
Loading…
Reference in a new issue