aboutsummaryrefslogtreecommitdiffstats
path: root/src/ngMock/angular-mocks.js
diff options
context:
space:
mode:
authorDaniel Luxemburg2014-02-03 20:04:46 -0500
committerTobias Bosch2014-02-04 16:41:25 -0800
commitdd24c78373b5d24ecb3b9d19e61e1b3b6c74d155 (patch)
tree7e0de9522b19e920ab6994da83e2b163c80cf0f3 /src/ngMock/angular-mocks.js
parent36d37c0e3880c774d20c014ade60d2331beefa15 (diff)
downloadangular.js-dd24c78373b5d24ecb3b9d19e61e1b3b6c74d155.tar.bz2
fix(ngMock): return false from mock $interval.cancel() when no argument is supplied
Closes #6103. Closed #6099.
Diffstat (limited to 'src/ngMock/angular-mocks.js')
-rw-r--r--src/ngMock/angular-mocks.js1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/ngMock/angular-mocks.js b/src/ngMock/angular-mocks.js
index bb720c1d..a6bcea88 100644
--- a/src/ngMock/angular-mocks.js
+++ b/src/ngMock/angular-mocks.js
@@ -504,6 +504,7 @@ angular.mock.$IntervalProvider = function() {
};
$interval.cancel = function(promise) {
+ if(!promise) return false;
var fnIndex;
angular.forEach(repeatFns, function(fn, index) {