admin/jasmine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use one declaration per statement

Browse Source 
The old style of merging all of a function's variable declarations into
a single statement made some sense back in the days of var, but there's
no reason to keep doing it now that we use const and let.
This commit is contained in:
Steve Gravrock
2026-03-10 20:02:42 -07:00
parent 03ebebf6fb
commit 434575f49d
88 changed files with 3650 additions and 3604 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
spec/core/integration/CustomAsyncMatchersSpec.js
View File

@@ -86,16 +86,16 @@ describe('Custom Async Matchers (Integration)', function() {
it('passes the jasmine utility to the matcher factory', async function() {
const matcherFactory = function() {
return {
compare: function() {
return Promise.resolve({ pass: true });
}
};
},
matcherFactorySpy = jasmine.createSpy(
'matcherFactorySpy',
matcherFactory
);
return {
compare: function() {
return Promise.resolve({ pass: true });
}
};
};
const matcherFactorySpy = jasmine.createSpy(
'matcherFactorySpy',
matcherFactory
);
env.it('spec with expectation', function() {
env.addAsyncMatchers({
@@ -117,19 +117,19 @@ describe('Custom Async Matchers (Integration)', function() {
it('provides custom equality testers to the matcher factory via matchersUtil', async function() {
const matcherFactory = function(matchersUtil) {
return {
compare: function(actual, expected) {
return Promise.resolve({
pass: matchersUtil.equals(actual[0], expected)
});
}
};
},
customEqualityFn = jasmine
.createSpy('customEqualityFn')
.and.callFake(function(a, b) {
return a.toString() === b;
});
return {
compare: function(actual, expected) {
return Promise.resolve({
pass: matchersUtil.equals(actual[0], expected)
});
}
};
};
const customEqualityFn = jasmine
.createSpy('customEqualityFn')
.and.callFake(function(a, b) {
return a.toString() === b;
});
env.it('spec with expectation', function() {
env.addCustomEqualityTester(customEqualityFn);

40
spec/core/integration/CustomMatchersSpec.js
View File

@@ -210,15 +210,15 @@ describe('Custom Matchers (Integration)', function() {
it('passes the jasmine utility to the matcher factory', async function() {
const matcherFactory = function() {
return {
compare: function() {
return { pass: true };
}
};
},
matcherFactorySpy = jasmine
.createSpy('matcherFactorySpy')
.and.callFake(matcherFactory);
return {
compare: function() {
return { pass: true };
}
};
};
const matcherFactorySpy = jasmine
.createSpy('matcherFactorySpy')
.and.callFake(matcherFactory);
env.it('spec with expectation', function() {
env.addMatchers({
@@ -236,17 +236,17 @@ describe('Custom Matchers (Integration)', function() {
it('provides custom equality testers to the matcher factory via matchersUtil', async function() {
const matcherFactory = function(matchersUtil) {
return {
compare: function(actual, expected) {
return { pass: matchersUtil.equals(actual[0], expected) };
}
};
},
customEqualityFn = jasmine
.createSpy('customEqualityFn')
.and.callFake(function(a, b) {
return a.toString() === b;
});
return {
compare: function(actual, expected) {
return { pass: matchersUtil.equals(actual[0], expected) };
}
};
};
const customEqualityFn = jasmine
.createSpy('customEqualityFn')
.and.callFake(function(a, b) {
return a.toString() === b;
});
env.it('spec with expectation', function() {
env.addCustomEqualityTester(customEqualityFn);

10
spec/core/integration/CustomSpyStrategiesSpec.js
View File

@@ -82,11 +82,11 @@ describe('Custom Spy Strategies (Integration)', function() {
});
it('allows multiple custom strategies to be used', async function() {
const plan1 = jasmine.createSpy('plan 1').and.returnValue(42),
strategy1 = jasmine.createSpy('strat 1').and.returnValue(plan1),
plan2 = jasmine.createSpy('plan 2').and.returnValue(24),
strategy2 = jasmine.createSpy('strat 2').and.returnValue(plan2),
specDone = jasmine.createSpy('specDone');
const plan1 = jasmine.createSpy('plan 1').and.returnValue(42);
const strategy1 = jasmine.createSpy('strat 1').and.returnValue(plan1);
const plan2 = jasmine.createSpy('plan 2').and.returnValue(24);
const strategy2 = jasmine.createSpy('strat 2').and.returnValue(plan2);
const specDone = jasmine.createSpy('specDone');
env.beforeEach(function() {
env.addSpyStrategy('frobnicate', strategy1);

147
spec/core/integration/EnvSpec.js
View File

@@ -246,8 +246,8 @@ describe('Env integration', function() {
});
it('calls associated beforeAlls/afterAlls only once per suite', async function() {
const before = jasmine.createSpy('beforeAll'),
after = jasmine.createSpy('afterAll');
const before = jasmine.createSpy('beforeAll');
const after = jasmine.createSpy('afterAll');
env.describe('with beforeAll and afterAll', function() {
env.it('spec', function() {
@@ -272,8 +272,8 @@ describe('Env integration', function() {
});
it('calls associated beforeAlls/afterAlls only once per suite for async', async function() {
const before = jasmine.createSpy('beforeAll'),
after = jasmine.createSpy('afterAll');
const before = jasmine.createSpy('beforeAll');
const after = jasmine.createSpy('afterAll');
env.describe('with beforeAll and afterAll', function() {
env.it('spec', function() {
@@ -675,8 +675,8 @@ describe('Env integration', function() {
});
it('reports when afterAll throws an exception', async function() {
const error = new Error('After All Exception'),
reporter = jasmine.createSpyObj('fakeReport', ['suiteDone']);
const error = new Error('After All Exception');
const reporter = jasmine.createSpyObj('fakeReport', ['suiteDone']);
env.addReporter(reporter);
@@ -719,8 +719,8 @@ describe('Env integration', function() {
});
it('reports when an async afterAll throws an exception', async function() {
const error = new Error('After All Exception'),
reporter = jasmine.createSpyObj('fakeReport', ['suiteDone']);
const error = new Error('After All Exception');
const reporter = jasmine.createSpyObj('fakeReport', ['suiteDone']);
env.addReporter(reporter);
@@ -838,8 +838,8 @@ describe('Env integration', function() {
});
it('Allows specifying which specs and suites to run', async function() {
const calls = [],
suiteCallback = jasmine.createSpy('suite callback');
const calls = [];
const suiteCallback = jasmine.createSpy('suite callback');
let firstSpec;
let secondSuite;
@@ -892,8 +892,8 @@ describe('Env integration', function() {
});
it('Allows filtering out specs and suites to run programmatically', async function() {
const calls = [],
suiteCallback = jasmine.createSpy('suite callback');
const calls = [];
const suiteCallback = jasmine.createSpy('suite callback');
env.addReporter({ suiteDone: suiteCallback });
@@ -1026,16 +1026,16 @@ describe('Env integration', function() {
});
it('removes all spies added in a spec after the spec is complete', async function() {
const originalFoo = function() {},
testObj = {
foo: originalFoo
},
firstSpec = jasmine.createSpy('firstSpec').and.callFake(function() {
env.spyOn(testObj, 'foo');
}),
secondSpec = jasmine.createSpy('secondSpec').and.callFake(function() {
expect(testObj.foo).toBe(originalFoo);
});
const originalFoo = function() {};
const testObj = {
foo: originalFoo
};
const firstSpec = jasmine.createSpy('firstSpec').and.callFake(function() {
env.spyOn(testObj, 'foo');
});
const secondSpec = jasmine.createSpy('secondSpec').and.callFake(function() {
expect(testObj.foo).toBe(originalFoo);
});
env.describe('test suite', function() {
env.it('spec 0', firstSpec);
env.it('spec 1', secondSpec);
@@ -1049,10 +1049,10 @@ describe('Env integration', function() {
});
it('removes all spies added in a suite after the suite is complete', async function() {
const originalFoo = function() {},
testObj = {
foo: originalFoo
};
const originalFoo = function() {};
const testObj = {
foo: originalFoo
};
env.describe('test suite', function() {
env.beforeAll(function() {
@@ -1078,10 +1078,10 @@ describe('Env integration', function() {
});
it('removes a spy from the top suite after the run is complete', async function() {
const originalFoo = function() {},
testObj = {
foo: originalFoo
};
const originalFoo = function() {};
const testObj = {
foo: originalFoo
};
env.beforeAll(function() {
env.spyOn(testObj, 'foo');
@@ -1098,16 +1098,16 @@ describe('Env integration', function() {
it('Mock clock can be installed and used in tests', async function() {
const globalSetTimeout = jasmine
.createSpy('globalSetTimeout')
.and.callFake(function(cb, t) {
return setTimeout(cb, t);
}),
delayedFunctionForGlobalClock = jasmine.createSpy(
'delayedFunctionForGlobalClock'
),
delayedFunctionForMockClock = jasmine.createSpy(
'delayedFunctionForMockClock'
);
.createSpy('globalSetTimeout')
.and.callFake(function(cb, t) {
return setTimeout(cb, t);
});
const delayedFunctionForGlobalClock = jasmine.createSpy(
'delayedFunctionForGlobalClock'
);
const delayedFunctionForMockClock = jasmine.createSpy(
'delayedFunctionForMockClock'
);
env.cleanup_();
env = new privateUnderTest.Env({
@@ -1255,8 +1255,8 @@ describe('Env integration', function() {
it('should not use the mock clock for asynchronous timeouts', async function() {
createMockedEnv();
const reporter = jasmine.createSpyObj('fakeReporter', ['specDone']),
clock = env.clock;
const reporter = jasmine.createSpyObj('fakeReporter', ['specDone']);
const clock = env.clock;
reporter.specDone.and.callFake(function() {
realSetTimeout(function() {
@@ -2121,8 +2121,8 @@ describe('Env integration', function() {
await env.execute();
const firstSpecResult = reporter.specDone.calls.first().args[0],
secondSpecResult = reporter.specDone.calls.mostRecent().args[0];
const firstSpecResult = reporter.specDone.calls.first().args[0];
const secondSpecResult = reporter.specDone.calls.mostRecent().args[0];
expect(firstSpecResult.status).toEqual('passed');
expect(secondSpecResult.status).toEqual('failed');
@@ -2158,9 +2158,9 @@ describe('Env integration', function() {
await env.execute();
const firstSpecResult = reporter.specDone.calls.first().args[0],
secondSpecResult = reporter.specDone.calls.argsFor(0)[0],
thirdSpecResult = reporter.specDone.calls.mostRecent().args[0];
const firstSpecResult = reporter.specDone.calls.first().args[0];
const secondSpecResult = reporter.specDone.calls.argsFor(0)[0];
const thirdSpecResult = reporter.specDone.calls.mostRecent().args[0];
expect(firstSpecResult.status).toEqual('passed');
expect(secondSpecResult.status).toEqual('passed');
@@ -2188,8 +2188,8 @@ describe('Env integration', function() {
await env.execute();
const firstSpecResult = reporter.specDone.calls.first().args[0],
secondSpecResult = reporter.specDone.calls.mostRecent().args[0];
const firstSpecResult = reporter.specDone.calls.first().args[0];
const secondSpecResult = reporter.specDone.calls.mostRecent().args[0];
expect(firstSpecResult.status).toEqual('passed');
expect(secondSpecResult.status).toEqual('failed');
@@ -2240,9 +2240,9 @@ describe('Env integration', function() {
await env.execute();
const firstSpecResult = reporter.specDone.calls.first().args[0],
secondSpecResult = reporter.specDone.calls.argsFor(1)[0],
thirdSpecResult = reporter.specDone.calls.mostRecent().args[0];
const firstSpecResult = reporter.specDone.calls.first().args[0];
const secondSpecResult = reporter.specDone.calls.argsFor(1)[0];
const thirdSpecResult = reporter.specDone.calls.mostRecent().args[0];
expect(firstSpecResult.status).toEqual('passed');
expect(secondSpecResult.status).toEqual('passed');
@@ -2410,8 +2410,11 @@ describe('Env integration', function() {
});
it('reports test properties on specs', async function() {
const env = new privateUnderTest.Env(),
reporter = jasmine.createSpyObj('reporter', ['suiteDone', 'specDone']);
const env = new privateUnderTest.Env();
const reporter = jasmine.createSpyObj('reporter', [
'suiteDone',
'specDone'
]);
reporter.specDone.and.callFake(function(e) {
expect(e.properties).toEqual({
@@ -2464,12 +2467,12 @@ describe('Env integration', function() {
});
it('reports test properties on suites', async function() {
const env = new privateUnderTest.Env(),
reporter = jasmine.createSpyObj('reporter', [
'jasmineDone',
'suiteDone',
'specDone'
]);
const env = new privateUnderTest.Env();
const reporter = jasmine.createSpyObj('reporter', [
'jasmineDone',
'suiteDone',
'specDone'
]);
reporter.suiteDone.and.callFake(function(e) {
expect(e.properties).toEqual({ b: 'Sweet' });
@@ -2937,15 +2940,15 @@ describe('Env integration', function() {
});
it('should report deprecation stack with an error object', async function() {
const exceptionFormatter = new privateUnderTest.ExceptionFormatter(),
reporter = jasmine.createSpyObj('reporter', [
'jasmineDone',
'suiteDone',
'specDone'
]),
topLevelError = new Error('top level deprecation'),
suiteLevelError = new Error('suite level deprecation'),
specLevelError = new Error('spec level deprecation');
const exceptionFormatter = new privateUnderTest.ExceptionFormatter();
const reporter = jasmine.createSpyObj('reporter', [
'jasmineDone',
'suiteDone',
'specDone'
]);
const topLevelError = new Error('top level deprecation');
const suiteLevelError = new Error('suite level deprecation');
const specLevelError = new Error('spec level deprecation');
// prevent deprecation from being displayed
spyOn(console, 'error');
@@ -3004,9 +3007,9 @@ describe('Env integration', function() {
});
it('supports async matchers', async function() {
const specDone = jasmine.createSpy('specDone'),
suiteDone = jasmine.createSpy('suiteDone'),
jasmineDone = jasmine.createSpy('jasmineDone');
const specDone = jasmine.createSpy('specDone');
const suiteDone = jasmine.createSpy('suiteDone');
const jasmineDone = jasmine.createSpy('jasmineDone');
env.addReporter({
specDone: specDone,

8
spec/core/integration/MatchersSpec.js
View File

@@ -560,16 +560,16 @@ describe('Matchers (Integration)', function() {
describe('toHaveBeenCalledBefore', function() {
verifyPasses(function(env) {
const a = env.createSpy('a'),
b = env.createSpy('b');
const a = env.createSpy('a');
const b = env.createSpy('b');
a();
b();
env.expect(a).toHaveBeenCalledBefore(b);
});
verifyFails(function(env) {
const a = env.createSpy('a'),
b = env.createSpy('b');
const a = env.createSpy('a');
const b = env.createSpy('b');
b();
a();
env.expect(a).toHaveBeenCalledBefore(b);

8
spec/core/integration/SpecRunningSpec.js
View File

@@ -517,8 +517,8 @@ describe('spec running', function() {
});
it('should allow top level suites to be disabled', async function() {
const specInADisabledSuite = jasmine.createSpy('specInADisabledSuite'),
otherSpec = jasmine.createSpy('otherSpec');
const specInADisabledSuite = jasmine.createSpy('specInADisabledSuite');
const otherSpec = jasmine.createSpy('otherSpec');
env.xdescribe('A disabled suite', function() {
env.it('spec inside a disabled suite', specInADisabledSuite);
@@ -551,8 +551,8 @@ describe('spec running', function() {
});
it('should recover gracefully when there are errors in describe functions', async function() {
const specs = [],
reporter = jasmine.createSpyObj(['specDone', 'suiteDone']);
const specs = [];
const reporter = jasmine.createSpyObj(['specDone', 'suiteDone']);
reporter.specDone.and.callFake(function(result) {
specs.push(result.fullName);