Skip to content

Commit bacc31b

Browse files
committed
fix(defer.cancel): should return false instead of undefined
1 parent ad90c35 commit bacc31b

File tree

4 files changed

+7
-3
lines changed

4 files changed

+7
-3
lines changed

src/Browser.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -404,6 +404,7 @@ function Browser(window, document, body, XHR, $log, $sniffer) {
404404
completeOutstandingRequest(noop);
405405
return true;
406406
}
407+
return false;
407408
};
408409

409410

src/angular-mocks.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -285,6 +285,8 @@ function MockBrowser() {
285285
self.deferredFns.splice(fnIndex, 1);
286286
return true;
287287
}
288+
289+
return false;
288290
};
289291

290292

test/BrowserSpecs.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -266,10 +266,11 @@ describe('browser', function() {
266266
deferId3 = browser.defer(function() { log.push('cancel me, now!'); });
267267

268268
expect(log).toEqual([]);
269-
browser.defer.cancel(deferId1);
270-
browser.defer.cancel(deferId3);
269+
expect(browser.defer.cancel(deferId1)).toBe(true);
270+
expect(browser.defer.cancel(deferId3)).toBe(true);
271271
fakeWindow.setTimeout.flush();
272272
expect(log).toEqual(['ok']);
273+
expect(browser.defer.cancel(deferId2)).toBe(false);
273274
});
274275
});
275276
});

test/service/deferSpec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ describe('$defer', function() {
114114
$browser.defer.flush();
115115
token2 = $defer(task2);
116116

117-
expect($defer.cancel(token1)).toBeFalsy();
117+
expect($defer.cancel(token1)).toBe(false);
118118
expect($defer.cancel(token2)).toBe(true);
119119
});
120120
});

0 commit comments

Comments
 (0)