Allow use without creating globals

* Fixes #1235
This commit is contained in:
Steve Gravrock
2021-11-29 18:49:05 -08:00
parent 5942654856
commit 42e6c45efa
15 changed files with 88 additions and 37 deletions

View File

@@ -99,7 +99,7 @@ describe('JsApiReporter', function() {
});
describe('#suiteResults', function() {
var reporter, suiteResult1, suiteResult2;
var reporter, suiteStarted1, suiteResult1, suiteResult2;
beforeEach(function() {
reporter = new jasmineUnderTest.JsApiReporter({});
suiteStarted1 = {

View File

@@ -471,20 +471,20 @@ describe('QueueRunner', function() {
}, 100);
return p1;
}
};
(queueableFn2 = {
fn: function() {
fnCallback();
setTimeout(function() {
p2.resolveHandler();
}, 100);
return p2;
}
}),
(queueRunner = new jasmineUnderTest.QueueRunner({
},
queueableFn2 = {
fn: function() {
fnCallback();
setTimeout(function() {
p2.resolveHandler();
}, 100);
return p2;
}
},
queueRunner = new jasmineUnderTest.QueueRunner({
queueableFns: [queueableFn1, queueableFn2],
onComplete: onComplete
}));
});
queueRunner.execute();
expect(fnCallback).not.toHaveBeenCalled();

View File

@@ -14,10 +14,12 @@ describe('Timer', function() {
describe('when date is stubbed, perhaps by other testing helpers', function() {
var origDate = Date;
beforeEach(function() {
// eslint-disable-next-line no-implicit-globals
Date = jasmine.createSpy('date spy');
});
afterEach(function() {
// eslint-disable-next-line no-implicit-globals
Date = origDate;
});

View File

@@ -513,20 +513,20 @@ describe('TreeProcessor', function() {
it('runs afterAlls for a node with children', function() {
var leaf = new Leaf(),
afterAllFns = [{ fn: 'afterAll1' }, { fn: 'afterAll2' }];
(node = new Node({
children: [leaf],
afterAllFns
})),
(root = new Node({ children: [node] })),
(queueRunner = jasmine.createSpy('queueRunner')),
(processor = new jasmineUnderTest.TreeProcessor({
afterAllFns = [{ fn: 'afterAll1' }, { fn: 'afterAll2' }],
node = new Node({
children: [leaf],
afterAllFns
}),
root = new Node({ children: [node] }),
queueRunner = jasmine.createSpy('queueRunner'),
processor = new jasmineUnderTest.TreeProcessor({
tree: root,
runnableIds: [node.id],
queueRunnerFactory: queueRunner
})),
(treeComplete = jasmine.createSpy('treeComplete')),
(nodeDone = jasmine.createSpy('nodeDone'));
}),
treeComplete = jasmine.createSpy('treeComplete'),
nodeDone = jasmine.createSpy('nodeDone');
processor.execute(treeComplete);
var queueableFns = queueRunner.calls.mostRecent().args[0].queueableFns;

View File

@@ -3427,7 +3427,7 @@ describe('Env integration', function() {
const spiedOnAllFuncs = { foo: function() {} };
env.spyOnAllFunctions(spiedOnAllFuncs);
for (spy of [
for (const spy of [
createSpySpy,
spiedOn.foo,
spyObj.foo,

View File

@@ -112,7 +112,7 @@ describe('DiffBuilder', function() {
return '[number:' + x + ']';
}
};
prettyPrinter = jasmineUnderTest.makePrettyPrinter([formatter]);
const prettyPrinter = jasmineUnderTest.makePrettyPrinter([formatter]);
var diffBuilder = new jasmineUnderTest.DiffBuilder({
prettyPrinter: prettyPrinter
});
@@ -131,7 +131,7 @@ describe('DiffBuilder', function() {
return '[thing with a=' + x.a + ', b=' + JSON.stringify(x.b) + ']';
}
};
prettyPrinter = jasmineUnderTest.makePrettyPrinter([formatter]);
const prettyPrinter = jasmineUnderTest.makePrettyPrinter([formatter]);
var diffBuilder = new jasmineUnderTest.DiffBuilder({
prettyPrinter: prettyPrinter
});

View File

@@ -94,7 +94,7 @@ describe('matchersUtil', function() {
});
it('fails for Arrays that have different lengths', function() {
matchersUtil = new jasmineUnderTest.MatchersUtil();
const matchersUtil = new jasmineUnderTest.MatchersUtil();
expect(matchersUtil.equals([1, 2], [1, 2, 3])).toBe(false);
});

View File

@@ -30,7 +30,7 @@ describe('toHaveBeenCalledBefore', function() {
secondSpy();
result = matcher.compare(firstSpy, secondSpy);
const result = matcher.compare(firstSpy, secondSpy);
expect(result.pass).toBe(false);
expect(result.message).toMatch(
/Expected spy first spy to have been called./
@@ -44,7 +44,7 @@ describe('toHaveBeenCalledBefore', function() {
firstSpy();
result = matcher.compare(firstSpy, secondSpy);
const result = matcher.compare(firstSpy, secondSpy);
expect(result.pass).toBe(false);
expect(result.message).toMatch(
/Expected spy second spy to have been called./