Cleanup: unused vars, dangling commas, negation

This commit is contained in:
Elliot Nelson
2019-05-18 08:11:47 -04:00
parent 1e855aa9b8
commit b1da6e3960
9 changed files with 10 additions and 32 deletions

View File

@@ -255,7 +255,7 @@ getJasmineRequireObj().Env = function(j$) {
var defaultResourcesForRunnable = function(id, parentRunnableId) { var defaultResourcesForRunnable = function(id, parentRunnableId) {
var resources = {spies: [], customEqualityTesters: [], customMatchers: {}, customSpyStrategies: {}}; var resources = {spies: [], customEqualityTesters: [], customMatchers: {}, customSpyStrategies: {}};
if(runnableResources[parentRunnableId]){ if(runnableResources[parentRunnableId]) {
resources.customEqualityTesters = j$.util.clone(runnableResources[parentRunnableId].customEqualityTesters); resources.customEqualityTesters = j$.util.clone(runnableResources[parentRunnableId].customEqualityTesters);
resources.customMatchers = j$.util.clone(runnableResources[parentRunnableId].customMatchers); resources.customMatchers = j$.util.clone(runnableResources[parentRunnableId].customMatchers);
} }
@@ -307,9 +307,6 @@ getJasmineRequireObj().Env = function(j$) {
return buildExpectationResult(attrs); return buildExpectationResult(attrs);
}; };
var maximumSpecCallbackDepth = 20;
var currentSpecCallbackDepth = 0;
/** /**
* Sets whether Jasmine should throw an Error when an expectation fails. * Sets whether Jasmine should throw an Error when an expectation fails.
* This causes a spec to only have one expectation failure. * 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); spyRegistry.allowRespy(allow);
}; };
@@ -830,7 +827,7 @@ getJasmineRequireObj().Env = function(j$) {
timeout: timeout || 0 timeout: timeout || 0
}, },
throwOnExpectationFailure: config.oneFailurePerSpec, throwOnExpectationFailure: config.oneFailurePerSpec,
timer: new j$.Timer(), timer: new j$.Timer()
}); });
return spec; return spec;
@@ -879,7 +876,7 @@ getJasmineRequireObj().Env = function(j$) {
return spec; return spec;
}; };
this.fit = function(description, fn, timeout){ this.fit = function(description, fn, timeout) {
ensureIsNotNested('fit'); ensureIsNotNested('fit');
ensureIsFunctionOrAsync(fn, 'fit'); ensureIsFunctionOrAsync(fn, 'fit');
var spec = specFactory(description, fn, currentDeclarationSuite, timeout); var spec = specFactory(description, fn, currentDeclarationSuite, timeout);

View File

@@ -40,7 +40,7 @@ getJasmineRequireObj().Spec = function(j$) {
passedExpectations: [], passedExpectations: [],
deprecationWarnings: [], deprecationWarnings: [],
pendingReason: '', pendingReason: '',
duration: null, duration: null
}; };
} }

View File

@@ -34,7 +34,7 @@ getJasmineRequireObj().Suite = function(j$) {
fullName: this.getFullName(), fullName: this.getFullName(),
failedExpectations: [], failedExpectations: [],
deprecationWarnings: [], deprecationWarnings: [],
duration: null, duration: null
}; };
} }

View File

@@ -225,7 +225,6 @@ getJasmineRequireObj().matchersUtil = function(j$) {
}); });
for (i = 0; i < aLength || i < bLength; i++) { for (i = 0; i < aLength || i < bLength; i++) {
var formatter = false;
diffBuilder.withPath(i, function() { diffBuilder.withPath(i, function() {
if (i >= bLength) { if (i >= bLength) {
diffBuilder.record(a[i], void 0, actualArrayIsLongerFormatter); diffBuilder.record(a[i], void 0, actualArrayIsLongerFormatter);
@@ -417,10 +416,6 @@ getJasmineRequireObj().matchersUtil = function(j$) {
return extraKeys; return extraKeys;
} }
function has(obj, key) {
return Object.prototype.hasOwnProperty.call(obj, key);
}
function isFunction(obj) { function isFunction(obj) {
return typeof obj === 'function'; return typeof obj === 'function';
} }

View File

@@ -28,7 +28,7 @@ getJasmineRequireObj().requireMatchers = function(jRequire, j$) {
'toMatch', 'toMatch',
'toThrow', 'toThrow',
'toThrowError', 'toThrowError',
'toThrowMatching', 'toThrowMatching'
], ],
matchers = {}; matchers = {};

View File

@@ -13,7 +13,7 @@ getJasmineRequireObj().toBe = function(j$) {
return { return {
compare: function(actual, expected) { compare: function(actual, expected) {
var result = { var result = {
pass: actual === expected, pass: actual === expected
}; };
if (typeof expected === 'object') { if (typeof expected === 'object') {

View File

@@ -10,7 +10,7 @@ getJasmineRequireObj().toBeFalsy = function() {
return { return {
compare: function(actual) { compare: function(actual) {
return { return {
pass: !!!actual pass: !actual
}; };
} }
}; };

View File

@@ -20,7 +20,7 @@ getJasmineRequireObj().toHaveBeenCalledTimes = function(j$) {
var args = Array.prototype.slice.call(arguments, 0), var args = Array.prototype.slice.call(arguments, 0),
result = { pass: false }; 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.')); throw new Error(getErrorMsg('The expected times failed is a required argument and must be a number.'));
} }

View File

@@ -100,18 +100,6 @@ getJasmineRequireObj().util = function(j$) {
return Object.prototype.hasOwnProperty.call(obj, key); 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 () { util.errorWithStack = function errorWithStack () {
// Don't throw and catch if we don't have to, because it makes it harder // 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. // for users to debug their code with exception breakpoints.
@@ -138,8 +126,6 @@ getJasmineRequireObj().util = function(j$) {
var result; var result;
return function() { return function() {
var trace;
if (!result) { if (!result) {
result = callerFile(); result = callerFile();
} }