diff --git a/src/core/Matchers.js b/src/core/Matchers.js index 7303facbc..24b40361a 100644 --- a/src/core/Matchers.js +++ b/src/core/Matchers.js @@ -51,11 +51,9 @@ jasmine.Matchers.matcherFn_ = function(matcherName, matcherFunction) { } else { var englishyPredicate = matcherName.replace(/[A-Z]/g, function(s) { return ' ' + s.toLowerCase(); }); message = "Expected " + jasmine.pp(this.actual) + (this.isNot ? " not " : " ") + englishyPredicate; - if (matcherArgs.length > 0) { - for (var i = 0; i < matcherArgs.length; i++) { - if (i > 0) message += ","; - message += " " + jasmine.pp(matcherArgs[i]); - } + for (var i = 0; i < matcherArgs.length; i++) { + if (i > 0) message += ","; + message += " " + jasmine.pp(matcherArgs[i]); } message += "."; } diff --git a/src/core/mock-timeout.js b/src/core/mock-timeout.js index c5f9aacd4..5b6b21228 100755 --- a/src/core/mock-timeout.js +++ b/src/core/mock-timeout.js @@ -53,24 +53,24 @@ jasmine.FakeTimer.prototype.runFunctionsWithinRange = function(oldMillis, nowMil } } - if (funcsToRun.length > 0) { - funcsToRun.sort(function(a, b) { - return a.runAtMillis - b.runAtMillis; - }); - for (var i = 0; i < funcsToRun.length; ++i) { - try { - var funcToRun = funcsToRun[i]; - this.nowMillis = funcToRun.runAtMillis; - funcToRun.funcToCall(); - if (funcToRun.recurring) { - this.scheduleFunction(funcToRun.timeoutKey, - funcToRun.funcToCall, - funcToRun.millis, - true); - } - } catch(e) { + funcsToRun.sort(function(a, b) { + return a.runAtMillis - b.runAtMillis; + }); + for (var i = 0; i < funcsToRun.length; ++i) { + try { + var funcToRun = funcsToRun[i]; + this.nowMillis = funcToRun.runAtMillis; + funcToRun.funcToCall(); + if (funcToRun.recurring) { + this.scheduleFunction(funcToRun.timeoutKey, + funcToRun.funcToCall, + funcToRun.millis, + true); } + } catch(e) { } + } + if (funcsToRun.length > 0) { this.runFunctionsWithinRange(oldMillis, nowMillis); } };