diff --git a/lib/jasmine-core/jasmine-html.js b/lib/jasmine-core/jasmine-html.js index 72aa851c..3e6950d5 100644 --- a/lib/jasmine-core/jasmine-html.js +++ b/lib/jasmine-core/jasmine-html.js @@ -137,7 +137,7 @@ jasmineRequire.HtmlReporter = function(j$) { console.error('Spec \'' + result.fullName + '\' has no expectations.'); } - if (!symbols){ + if (!symbols) { symbols = find('.jasmine-symbol-summary'); } diff --git a/lib/jasmine-core/jasmine.js b/lib/jasmine-core/jasmine.js index 7d9425d0..89c7e0c6 100644 --- a/lib/jasmine-core/jasmine.js +++ b/lib/jasmine-core/jasmine.js @@ -133,7 +133,7 @@ getJasmineRequireObj().requireMatchers = function(jRequire, j$) { 'toMatch', 'toThrow', 'toThrowError', - 'toThrowMatching', + 'toThrowMatching' ], matchers = {}; @@ -318,7 +318,7 @@ getJasmineRequireObj().base = function(j$, jasmineGlobal) { * @name jasmine.truthy * @function */ - j$.truthy = function() {return new j$.Truthy();}; + j$.truthy = function() { return new j$.Truthy(); }; /** * Get a matcher, usable in any {@link matchers|matcher} that uses Jasmine's equality (e.g. {@link matchers#toEqual|toEqual}, {@link matchers#toContain|toContain}, or {@link matchers#toHaveBeenCalledWith|toHaveBeenCalledWith}), @@ -326,7 +326,7 @@ getJasmineRequireObj().base = function(j$, jasmineGlobal) { * @name jasmine.falsy * @function */ - j$.falsy = function() {return new j$.Falsy();}; + j$.falsy = function() { return new j$.Falsy(); }; /** * Get a matcher, usable in any {@link matchers|matcher} that uses Jasmine's equality (e.g. {@link matchers#toEqual|toEqual}, {@link matchers#toContain|toContain}, or {@link matchers#toHaveBeenCalledWith|toHaveBeenCalledWith}), @@ -334,7 +334,7 @@ getJasmineRequireObj().base = function(j$, jasmineGlobal) { * @name jasmine.empty * @function */ - j$.empty = function() {return new j$.Empty();}; + j$.empty = function() { return new j$.Empty(); }; /** * Get a matcher, usable in any {@link matchers|matcher} that uses Jasmine's equality (e.g. {@link matchers#toEqual|toEqual}, {@link matchers#toContain|toContain}, or {@link matchers#toHaveBeenCalledWith|toHaveBeenCalledWith}), @@ -342,7 +342,7 @@ getJasmineRequireObj().base = function(j$, jasmineGlobal) { * @name jasmine.notEmpty * @function */ - j$.notEmpty = function() {return new j$.NotEmpty();}; + j$.notEmpty = function() { return new j$.NotEmpty(); }; /** * Get a matcher, usable in any {@link matchers|matcher} that uses Jasmine's equality (e.g. {@link matchers#toEqual|toEqual}, {@link matchers#toContain|toContain}, or {@link matchers#toHaveBeenCalledWith|toHaveBeenCalledWith}), @@ -499,18 +499,6 @@ getJasmineRequireObj().util = function(j$) { return Object.prototype.hasOwnProperty.call(obj, key); }; - function anyMatch(pattern, lines) { - var i; - - for (i = 0; i < lines.length; i++) { - if (lines[i].match(pattern)) { - return true; - } - } - - return false; - } - util.errorWithStack = function errorWithStack () { // Don't throw and catch if we don't have to, because it makes it harder // for users to debug their code with exception breakpoints. @@ -537,8 +525,6 @@ getJasmineRequireObj().util = function(j$) { var result; return function() { - var trace; - if (!result) { result = callerFile(); } @@ -592,7 +578,7 @@ getJasmineRequireObj().Spec = function(j$) { passedExpectations: [], deprecationWarnings: [], pendingReason: '', - duration: null, + duration: null }; } @@ -1047,7 +1033,7 @@ getJasmineRequireObj().Env = function(j$) { var defaultResourcesForRunnable = function(id, parentRunnableId) { var resources = {spies: [], customEqualityTesters: [], customMatchers: {}, customSpyStrategies: {}}; - if(runnableResources[parentRunnableId]){ + if(runnableResources[parentRunnableId]) { resources.customEqualityTesters = j$.util.clone(runnableResources[parentRunnableId].customEqualityTesters); resources.customMatchers = j$.util.clone(runnableResources[parentRunnableId].customMatchers); } @@ -1099,9 +1085,6 @@ getJasmineRequireObj().Env = function(j$) { return buildExpectationResult(attrs); }; - var maximumSpecCallbackDepth = 20; - var currentSpecCallbackDepth = 0; - /** * Sets whether Jasmine should throw an Error when an expectation fails. * This causes a spec to only have one expectation failure. @@ -1458,7 +1441,7 @@ getJasmineRequireObj().Env = function(j$) { } }); - this.allowRespy = function(allow){ + this.allowRespy = function(allow) { spyRegistry.allowRespy(allow); }; @@ -1622,7 +1605,7 @@ getJasmineRequireObj().Env = function(j$) { timeout: timeout || 0 }, throwOnExpectationFailure: config.oneFailurePerSpec, - timer: new j$.Timer(), + timer: new j$.Timer() }); return spec; @@ -1671,7 +1654,7 @@ getJasmineRequireObj().Env = function(j$) { return spec; }; - this.fit = function(description, fn, timeout){ + this.fit = function(description, fn, timeout) { ensureIsNotNested('fit'); ensureIsFunctionOrAsync(fn, 'fit'); var spec = specFactory(description, fn, currentDeclarationSuite, timeout); @@ -2247,7 +2230,7 @@ getJasmineRequireObj().CallTracker = function(j$) { */ this.allArgs = function() { var callArgs = []; - for(var i = 0; i < calls.length; i++){ + for(var i = 0; i < calls.length; i++) { callArgs.push(calls[i].args); } @@ -3126,7 +3109,7 @@ getJasmineRequireObj().Expector = function(j$) { this.util = options.util || { buildFailureMessage: function() {} }; this.customEqualityTesters = options.customEqualityTesters || []; this.actual = options.actual; - this.addExpectationResult = options.addExpectationResult || function(){}; + this.addExpectationResult = options.addExpectationResult || function() {}; this.filters = new j$.ExpectationFilterChain(); } @@ -3780,7 +3763,6 @@ getJasmineRequireObj().matchersUtil = function(j$) { }); for (i = 0; i < aLength || i < bLength; i++) { - var formatter = false; diffBuilder.withPath(i, function() { if (i >= bLength) { diffBuilder.record(a[i], void 0, actualArrayIsLongerFormatter); @@ -3972,10 +3954,6 @@ getJasmineRequireObj().matchersUtil = function(j$) { return extraKeys; } - function has(obj, key) { - return Object.prototype.hasOwnProperty.call(obj, key); - } - function isFunction(obj) { return typeof obj === 'function'; } @@ -4142,7 +4120,7 @@ getJasmineRequireObj().toBe = function(j$) { return { compare: function(actual, expected) { var result = { - pass: actual === expected, + pass: actual === expected }; if (typeof expected === 'object') { @@ -4248,7 +4226,7 @@ getJasmineRequireObj().toBeFalsy = function() { return { compare: function(actual) { return { - pass: !!!actual + pass: !actual }; } }; @@ -4745,7 +4723,7 @@ getJasmineRequireObj().toHaveBeenCalledTimes = function(j$) { var args = Array.prototype.slice.call(arguments, 0), result = { pass: false }; - if (!j$.isNumber_(expected)){ + if (!j$.isNumber_(expected)) { throw new Error(getErrorMsg('The expected times failed is a required argument and must be a number.')); } @@ -5246,7 +5224,7 @@ getJasmineRequireObj().MockDate = function() { FakeDate.parse = GlobalDate.parse; FakeDate.UTC = GlobalDate.UTC; } - } + } return MockDate; }; @@ -5368,7 +5346,7 @@ getJasmineRequireObj().pp = function(j$) { } this.format(array[i]); } - if(array.length > length){ + if(array.length > length) { this.append(', ...'); } @@ -5408,7 +5386,7 @@ getJasmineRequireObj().pp = function(j$) { i++; }, this ); - if (set.size > size){ + if (set.size > size) { this.append(', ...'); } this.append(' )'); @@ -5433,7 +5411,7 @@ getJasmineRequireObj().pp = function(j$) { i++; }, this ); - if (map.size > size){ + if (map.size > size) { this.append(', ...'); } this.append(' )'); @@ -5613,7 +5591,7 @@ getJasmineRequireObj().QueueRunner = function(j$) { this.queueableFns = queueableFns.concat(attrs.cleanupFns || []); this.firstCleanupIx = queueableFns.length; this.onComplete = attrs.onComplete || emptyFn; - this.clearStack = attrs.clearStack || function(fn) {fn();}; + this.clearStack = attrs.clearStack || function(fn) { fn(); }; this.onException = attrs.onException || emptyFn; this.userContext = attrs.userContext || new j$.UserContext(); this.timeout = attrs.timeout || {setTimeout: setTimeout, clearTimeout: clearTimeout}; @@ -6850,7 +6828,7 @@ getJasmineRequireObj().StackTrace = function(j$) { return messageLines.length; } - + return StackTrace; }; @@ -6890,7 +6868,7 @@ getJasmineRequireObj().Suite = function(j$) { fullName: this.getFullName(), failedExpectations: [], deprecationWarnings: [], - duration: null, + duration: null }; } diff --git a/src/core/CallTracker.js b/src/core/CallTracker.js index f1fdfbc5..9a26b38b 100644 --- a/src/core/CallTracker.js +++ b/src/core/CallTracker.js @@ -64,7 +64,7 @@ getJasmineRequireObj().CallTracker = function(j$) { */ this.allArgs = function() { var callArgs = []; - for(var i = 0; i < calls.length; i++){ + for(var i = 0; i < calls.length; i++) { callArgs.push(calls[i].args); } diff --git a/src/core/Env.js b/src/core/Env.js index e06d7546..b0c09040 100644 --- a/src/core/Env.js +++ b/src/core/Env.js @@ -255,7 +255,7 @@ getJasmineRequireObj().Env = function(j$) { var defaultResourcesForRunnable = function(id, parentRunnableId) { var resources = {spies: [], customEqualityTesters: [], customMatchers: {}, customSpyStrategies: {}}; - if(runnableResources[parentRunnableId]){ + if(runnableResources[parentRunnableId]) { resources.customEqualityTesters = j$.util.clone(runnableResources[parentRunnableId].customEqualityTesters); resources.customMatchers = j$.util.clone(runnableResources[parentRunnableId].customMatchers); } @@ -307,9 +307,6 @@ getJasmineRequireObj().Env = function(j$) { return buildExpectationResult(attrs); }; - var maximumSpecCallbackDepth = 20; - var currentSpecCallbackDepth = 0; - /** * Sets whether Jasmine should throw an Error when an expectation fails. * This causes a spec to only have one expectation failure. @@ -666,7 +663,7 @@ getJasmineRequireObj().Env = function(j$) { } }); - this.allowRespy = function(allow){ + this.allowRespy = function(allow) { spyRegistry.allowRespy(allow); }; @@ -830,7 +827,7 @@ getJasmineRequireObj().Env = function(j$) { timeout: timeout || 0 }, throwOnExpectationFailure: config.oneFailurePerSpec, - timer: new j$.Timer(), + timer: new j$.Timer() }); return spec; @@ -879,7 +876,7 @@ getJasmineRequireObj().Env = function(j$) { return spec; }; - this.fit = function(description, fn, timeout){ + this.fit = function(description, fn, timeout) { ensureIsNotNested('fit'); ensureIsFunctionOrAsync(fn, 'fit'); var spec = specFactory(description, fn, currentDeclarationSuite, timeout); diff --git a/src/core/Expector.js b/src/core/Expector.js index a8c717f2..55667f51 100644 --- a/src/core/Expector.js +++ b/src/core/Expector.js @@ -3,7 +3,7 @@ getJasmineRequireObj().Expector = function(j$) { this.util = options.util || { buildFailureMessage: function() {} }; this.customEqualityTesters = options.customEqualityTesters || []; this.actual = options.actual; - this.addExpectationResult = options.addExpectationResult || function(){}; + this.addExpectationResult = options.addExpectationResult || function() {}; this.filters = new j$.ExpectationFilterChain(); } diff --git a/src/core/MockDate.js b/src/core/MockDate.js index 0e5a8008..9dfc0628 100644 --- a/src/core/MockDate.js +++ b/src/core/MockDate.js @@ -76,7 +76,7 @@ getJasmineRequireObj().MockDate = function() { FakeDate.parse = GlobalDate.parse; FakeDate.UTC = GlobalDate.UTC; } - } + } return MockDate; }; diff --git a/src/core/PrettyPrinter.js b/src/core/PrettyPrinter.js index b8cf9118..5b3dd55f 100644 --- a/src/core/PrettyPrinter.js +++ b/src/core/PrettyPrinter.js @@ -115,7 +115,7 @@ getJasmineRequireObj().pp = function(j$) { } this.format(array[i]); } - if(array.length > length){ + if(array.length > length) { this.append(', ...'); } @@ -155,7 +155,7 @@ getJasmineRequireObj().pp = function(j$) { i++; }, this ); - if (set.size > size){ + if (set.size > size) { this.append(', ...'); } this.append(' )'); @@ -180,7 +180,7 @@ getJasmineRequireObj().pp = function(j$) { i++; }, this ); - if (map.size > size){ + if (map.size > size) { this.append(', ...'); } this.append(' )'); diff --git a/src/core/QueueRunner.js b/src/core/QueueRunner.js index 1566bcd3..c183c1d4 100644 --- a/src/core/QueueRunner.js +++ b/src/core/QueueRunner.js @@ -22,7 +22,7 @@ getJasmineRequireObj().QueueRunner = function(j$) { this.queueableFns = queueableFns.concat(attrs.cleanupFns || []); this.firstCleanupIx = queueableFns.length; this.onComplete = attrs.onComplete || emptyFn; - this.clearStack = attrs.clearStack || function(fn) {fn();}; + this.clearStack = attrs.clearStack || function(fn) { fn(); }; this.onException = attrs.onException || emptyFn; this.userContext = attrs.userContext || new j$.UserContext(); this.timeout = attrs.timeout || {setTimeout: setTimeout, clearTimeout: clearTimeout}; diff --git a/src/core/Spec.js b/src/core/Spec.js index 8adbacd7..4b31925d 100644 --- a/src/core/Spec.js +++ b/src/core/Spec.js @@ -40,7 +40,7 @@ getJasmineRequireObj().Spec = function(j$) { passedExpectations: [], deprecationWarnings: [], pendingReason: '', - duration: null, + duration: null }; } diff --git a/src/core/StackTrace.js b/src/core/StackTrace.js index c10ec951..6c6ec458 100644 --- a/src/core/StackTrace.js +++ b/src/core/StackTrace.js @@ -104,6 +104,6 @@ getJasmineRequireObj().StackTrace = function(j$) { return messageLines.length; } - + return StackTrace; }; diff --git a/src/core/Suite.js b/src/core/Suite.js index e076e73f..bbb582a8 100644 --- a/src/core/Suite.js +++ b/src/core/Suite.js @@ -34,7 +34,7 @@ getJasmineRequireObj().Suite = function(j$) { fullName: this.getFullName(), failedExpectations: [], deprecationWarnings: [], - duration: null, + duration: null }; } diff --git a/src/core/base.js b/src/core/base.js index 3a584f09..9c8be408 100644 --- a/src/core/base.js +++ b/src/core/base.js @@ -171,7 +171,7 @@ getJasmineRequireObj().base = function(j$, jasmineGlobal) { * @name jasmine.truthy * @function */ - j$.truthy = function() {return new j$.Truthy();}; + j$.truthy = function() { return new j$.Truthy(); }; /** * Get a matcher, usable in any {@link matchers|matcher} that uses Jasmine's equality (e.g. {@link matchers#toEqual|toEqual}, {@link matchers#toContain|toContain}, or {@link matchers#toHaveBeenCalledWith|toHaveBeenCalledWith}), @@ -179,7 +179,7 @@ getJasmineRequireObj().base = function(j$, jasmineGlobal) { * @name jasmine.falsy * @function */ - j$.falsy = function() {return new j$.Falsy();}; + j$.falsy = function() { return new j$.Falsy(); }; /** * Get a matcher, usable in any {@link matchers|matcher} that uses Jasmine's equality (e.g. {@link matchers#toEqual|toEqual}, {@link matchers#toContain|toContain}, or {@link matchers#toHaveBeenCalledWith|toHaveBeenCalledWith}), @@ -187,7 +187,7 @@ getJasmineRequireObj().base = function(j$, jasmineGlobal) { * @name jasmine.empty * @function */ - j$.empty = function() {return new j$.Empty();}; + j$.empty = function() { return new j$.Empty(); }; /** * Get a matcher, usable in any {@link matchers|matcher} that uses Jasmine's equality (e.g. {@link matchers#toEqual|toEqual}, {@link matchers#toContain|toContain}, or {@link matchers#toHaveBeenCalledWith|toHaveBeenCalledWith}), @@ -195,7 +195,7 @@ getJasmineRequireObj().base = function(j$, jasmineGlobal) { * @name jasmine.notEmpty * @function */ - j$.notEmpty = function() {return new j$.NotEmpty();}; + j$.notEmpty = function() { return new j$.NotEmpty(); }; /** * Get a matcher, usable in any {@link matchers|matcher} that uses Jasmine's equality (e.g. {@link matchers#toEqual|toEqual}, {@link matchers#toContain|toContain}, or {@link matchers#toHaveBeenCalledWith|toHaveBeenCalledWith}), diff --git a/src/core/matchers/matchersUtil.js b/src/core/matchers/matchersUtil.js index 3352fc30..14647dd6 100644 --- a/src/core/matchers/matchersUtil.js +++ b/src/core/matchers/matchersUtil.js @@ -225,7 +225,6 @@ getJasmineRequireObj().matchersUtil = function(j$) { }); for (i = 0; i < aLength || i < bLength; i++) { - var formatter = false; diffBuilder.withPath(i, function() { if (i >= bLength) { diffBuilder.record(a[i], void 0, actualArrayIsLongerFormatter); @@ -417,10 +416,6 @@ getJasmineRequireObj().matchersUtil = function(j$) { return extraKeys; } - function has(obj, key) { - return Object.prototype.hasOwnProperty.call(obj, key); - } - function isFunction(obj) { return typeof obj === 'function'; } diff --git a/src/core/matchers/requireMatchers.js b/src/core/matchers/requireMatchers.js index c40df70e..e8b1fd58 100644 --- a/src/core/matchers/requireMatchers.js +++ b/src/core/matchers/requireMatchers.js @@ -28,7 +28,7 @@ getJasmineRequireObj().requireMatchers = function(jRequire, j$) { 'toMatch', 'toThrow', 'toThrowError', - 'toThrowMatching', + 'toThrowMatching' ], matchers = {}; diff --git a/src/core/matchers/toBe.js b/src/core/matchers/toBe.js index 96b236a7..f92ed1ba 100644 --- a/src/core/matchers/toBe.js +++ b/src/core/matchers/toBe.js @@ -13,7 +13,7 @@ getJasmineRequireObj().toBe = function(j$) { return { compare: function(actual, expected) { var result = { - pass: actual === expected, + pass: actual === expected }; if (typeof expected === 'object') { diff --git a/src/core/matchers/toBeFalsy.js b/src/core/matchers/toBeFalsy.js index 7e06f55f..9ef75792 100644 --- a/src/core/matchers/toBeFalsy.js +++ b/src/core/matchers/toBeFalsy.js @@ -10,7 +10,7 @@ getJasmineRequireObj().toBeFalsy = function() { return { compare: function(actual) { return { - pass: !!!actual + pass: !actual }; } }; diff --git a/src/core/matchers/toHaveBeenCalledTimes.js b/src/core/matchers/toHaveBeenCalledTimes.js index 786b9547..b05ee8fe 100644 --- a/src/core/matchers/toHaveBeenCalledTimes.js +++ b/src/core/matchers/toHaveBeenCalledTimes.js @@ -20,7 +20,7 @@ getJasmineRequireObj().toHaveBeenCalledTimes = function(j$) { var args = Array.prototype.slice.call(arguments, 0), result = { pass: false }; - if (!j$.isNumber_(expected)){ + if (!j$.isNumber_(expected)) { throw new Error(getErrorMsg('The expected times failed is a required argument and must be a number.')); } diff --git a/src/core/util.js b/src/core/util.js index 7bf93d3f..f885d2cb 100644 --- a/src/core/util.js +++ b/src/core/util.js @@ -100,18 +100,6 @@ getJasmineRequireObj().util = function(j$) { return Object.prototype.hasOwnProperty.call(obj, key); }; - function anyMatch(pattern, lines) { - var i; - - for (i = 0; i < lines.length; i++) { - if (lines[i].match(pattern)) { - return true; - } - } - - return false; - } - util.errorWithStack = function errorWithStack () { // Don't throw and catch if we don't have to, because it makes it harder // for users to debug their code with exception breakpoints. @@ -138,8 +126,6 @@ getJasmineRequireObj().util = function(j$) { var result; return function() { - var trace; - if (!result) { result = callerFile(); } diff --git a/src/html/HtmlReporter.js b/src/html/HtmlReporter.js index c9be5590..880f9558 100644 --- a/src/html/HtmlReporter.js +++ b/src/html/HtmlReporter.js @@ -108,7 +108,7 @@ jasmineRequire.HtmlReporter = function(j$) { console.error('Spec \'' + result.fullName + '\' has no expectations.'); } - if (!symbols){ + if (!symbols) { symbols = find('.jasmine-symbol-summary'); }