Deprecate multiple calls to done callbacks
This commit is contained in:
@@ -305,6 +305,32 @@ describe('QueueRunner', function() {
|
||||
expect(onComplete).toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it('does not call onMultipleDone if an asynchrnous function completes after timing out', function() {
|
||||
var timeout = 3,
|
||||
queueableFn = {
|
||||
fn: function(done) {
|
||||
queueableFnDone = done;
|
||||
},
|
||||
type: 'queueable',
|
||||
timeout: timeout
|
||||
},
|
||||
onComplete = jasmine.createSpy('onComplete'),
|
||||
onMultipleDone = jasmine.createSpy('onMultipleDone'),
|
||||
queueRunner = new jasmineUnderTest.QueueRunner({
|
||||
queueableFns: [queueableFn],
|
||||
onComplete: onComplete,
|
||||
onMultipleDone: onMultipleDone
|
||||
}),
|
||||
queueableFnDone;
|
||||
|
||||
queueRunner.execute();
|
||||
jasmine.clock().tick(timeout);
|
||||
queueableFnDone();
|
||||
|
||||
expect(onComplete).toHaveBeenCalled();
|
||||
expect(onMultipleDone).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it('by default does not set a timeout for asynchronous functions', function() {
|
||||
var beforeFn = { fn: function(done) {} },
|
||||
queueableFn = { fn: jasmine.createSpy('fn') },
|
||||
@@ -380,13 +406,16 @@ describe('QueueRunner', function() {
|
||||
}
|
||||
},
|
||||
nextQueueableFn = { fn: jasmine.createSpy('nextFn') },
|
||||
onMultipleDone = jasmine.createSpy('onMultipleDone'),
|
||||
queueRunner = new jasmineUnderTest.QueueRunner({
|
||||
queueableFns: [queueableFn, nextQueueableFn]
|
||||
queueableFns: [queueableFn, nextQueueableFn],
|
||||
onMultipleDone: onMultipleDone
|
||||
});
|
||||
|
||||
queueRunner.execute();
|
||||
jasmine.clock().tick(1);
|
||||
expect(nextQueueableFn.fn.calls.count()).toEqual(1);
|
||||
expect(onMultipleDone).toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it('does not move to the next spec if done is called after an exception has ended the spec', function() {
|
||||
@@ -397,13 +426,17 @@ describe('QueueRunner', function() {
|
||||
}
|
||||
},
|
||||
nextQueueableFn = { fn: jasmine.createSpy('nextFn') },
|
||||
deprecated = jasmine.createSpy('deprecated'),
|
||||
queueRunner = new jasmineUnderTest.QueueRunner({
|
||||
deprecated: deprecated,
|
||||
queueableFns: [queueableFn, nextQueueableFn]
|
||||
});
|
||||
|
||||
queueRunner.execute();
|
||||
jasmine.clock().tick(1);
|
||||
expect(nextQueueableFn.fn.calls.count()).toEqual(1);
|
||||
// Don't issue a deprecation. The error already tells the user that
|
||||
// something went wrong.
|
||||
expect(deprecated).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it('should return a null when you call done', function() {
|
||||
|
||||
@@ -516,4 +516,31 @@ describe('Spec', function() {
|
||||
args.cleanupFns[0].fn();
|
||||
expect(resultCallback.calls.first().args[0].failedExpectations).toEqual([]);
|
||||
});
|
||||
|
||||
it('passes an onMultipleDone that logs a deprecation', function() {
|
||||
var queueRunnerFactory = jasmine.createSpy('queueRunnerFactory'),
|
||||
deprecated = jasmine.createSpy('depredated'),
|
||||
spec = new jasmineUnderTest.Spec({
|
||||
deprecated: deprecated,
|
||||
queueableFn: { fn: function() {} },
|
||||
queueRunnerFactory: queueRunnerFactory,
|
||||
getSpecName: function() {
|
||||
return 'a spec';
|
||||
}
|
||||
});
|
||||
|
||||
spec.execute();
|
||||
|
||||
expect(queueRunnerFactory).toHaveBeenCalled();
|
||||
queueRunnerFactory.calls.argsFor(0)[0].onMultipleDone();
|
||||
|
||||
expect(deprecated).toHaveBeenCalledWith(
|
||||
"An asynchronous function called its 'done' " +
|
||||
'callback more than once. This is a bug in the spec, beforeAll, ' +
|
||||
'beforeEach, afterAll, or afterEach function in question. This will ' +
|
||||
'be treated as an error in a future version.\n' +
|
||||
'(in spec: a spec)',
|
||||
{ ignoreRunnable: true }
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
@@ -142,4 +142,44 @@ describe('Suite', function() {
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
describe('#onMultipleDone', function() {
|
||||
it('logs a special deprecation when it is the top suite', function() {
|
||||
var env = jasmine.createSpyObj('env', ['deprecated']);
|
||||
var suite = new jasmineUnderTest.Suite({ env: env, parentSuite: null });
|
||||
|
||||
suite.onMultipleDone();
|
||||
|
||||
expect(env.deprecated).toHaveBeenCalledWith(
|
||||
'A top-level beforeAll or afterAll function called its ' +
|
||||
"'done' callback more than once. This is a bug in the beforeAll " +
|
||||
'or afterAll function in question. This will be treated as an ' +
|
||||
'error in a future version.',
|
||||
{ ignoreRunnable: true }
|
||||
);
|
||||
});
|
||||
|
||||
it('logs a deprecation including the suite name when it is a normal suite', function() {
|
||||
var env = jasmine.createSpyObj('env', ['deprecated']);
|
||||
var suite = new jasmineUnderTest.Suite({
|
||||
env: env,
|
||||
description: 'the suite',
|
||||
parentSuite: {
|
||||
description: 'the parent suite',
|
||||
parentSuite: {}
|
||||
}
|
||||
});
|
||||
|
||||
suite.onMultipleDone();
|
||||
|
||||
expect(env.deprecated).toHaveBeenCalledWith(
|
||||
"An asynchronous function called its 'done' callback more than " +
|
||||
'once. This is a bug in the spec, beforeAll, beforeEach, afterAll, ' +
|
||||
'or afterEach function in question. This will be treated as an error ' +
|
||||
'in a future version.\n' +
|
||||
'(in suite: the parent suite the suite)',
|
||||
{ ignoreRunnable: true }
|
||||
);
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
@@ -291,7 +291,8 @@ describe('TreeProcessor', function() {
|
||||
onComplete: treeComplete,
|
||||
onException: jasmine.any(Function),
|
||||
userContext: { root: 'context' },
|
||||
queueableFns: [{ fn: jasmine.any(Function) }]
|
||||
queueableFns: [{ fn: jasmine.any(Function) }],
|
||||
onMultipleDone: null
|
||||
});
|
||||
|
||||
queueRunner.calls.mostRecent().args[0].queueableFns[0].fn('foo');
|
||||
@@ -321,16 +322,19 @@ describe('TreeProcessor', function() {
|
||||
onComplete: treeComplete,
|
||||
onException: jasmine.any(Function),
|
||||
userContext: { root: 'context' },
|
||||
queueableFns: [{ fn: jasmine.any(Function) }]
|
||||
queueableFns: [{ fn: jasmine.any(Function) }],
|
||||
onMultipleDone: null
|
||||
});
|
||||
|
||||
queueRunner.calls.mostRecent().args[0].queueableFns[0].fn(nodeDone);
|
||||
|
||||
expect(queueRunner).toHaveBeenCalledWith({
|
||||
onComplete: jasmine.any(Function),
|
||||
onMultipleDone: null,
|
||||
queueableFns: [{ fn: jasmine.any(Function) }],
|
||||
userContext: { node: 'context' },
|
||||
onException: jasmine.any(Function)
|
||||
onException: jasmine.any(Function),
|
||||
onMultipleDone: null
|
||||
});
|
||||
|
||||
queueRunner.calls.mostRecent().args[0].queueableFns[0].fn('foo');
|
||||
|
||||
@@ -513,6 +513,191 @@ describe('Env integration', function() {
|
||||
env.execute(null, assertions);
|
||||
});
|
||||
|
||||
it('deprecates multiple calls to done in the top suite', function(done) {
|
||||
var reporter = jasmine.createSpyObj('fakeReporter', ['jasmineDone']);
|
||||
var message =
|
||||
'A top-level beforeAll or afterAll function called its ' +
|
||||
"'done' callback more than once. This is a bug in the beforeAll " +
|
||||
'or afterAll function in question. This will be treated as an ' +
|
||||
'error in a future version.';
|
||||
|
||||
spyOn(console, 'error');
|
||||
env.addReporter(reporter);
|
||||
env.configure({ verboseDeprecations: true });
|
||||
env.beforeAll(function(innerDone) {
|
||||
innerDone();
|
||||
innerDone();
|
||||
});
|
||||
env.it('a spec, so the beforeAll runs', function() {});
|
||||
env.afterAll(function(innerDone) {
|
||||
innerDone();
|
||||
innerDone();
|
||||
});
|
||||
|
||||
env.execute(null, function() {
|
||||
var warnings;
|
||||
expect(reporter.jasmineDone).toHaveBeenCalled();
|
||||
warnings = reporter.jasmineDone.calls.argsFor(0)[0].deprecationWarnings;
|
||||
expect(warnings.length).toEqual(2);
|
||||
expect(warnings[0])
|
||||
.withContext('top beforeAll')
|
||||
.toEqual(jasmine.objectContaining({ message: message }));
|
||||
expect(warnings[1])
|
||||
.withContext('top afterAll')
|
||||
.toEqual(jasmine.objectContaining({ message: message }));
|
||||
done();
|
||||
});
|
||||
});
|
||||
|
||||
it('deprecates multiple calls to done in a non-top suite', function(done) {
|
||||
var reporter = jasmine.createSpyObj('fakeReporter', ['jasmineDone']);
|
||||
var message =
|
||||
"An asynchronous function called its 'done' " +
|
||||
'callback more than once. This is a bug in the spec, beforeAll, ' +
|
||||
'beforeEach, afterAll, or afterEach function in question. This will ' +
|
||||
'be treated as an error in a future version.';
|
||||
|
||||
spyOn(console, 'error');
|
||||
env.addReporter(reporter);
|
||||
env.configure({ verboseDeprecations: true });
|
||||
env.describe('a suite', function() {
|
||||
env.beforeAll(function(innerDone) {
|
||||
innerDone();
|
||||
innerDone();
|
||||
});
|
||||
env.it('a spec, so that before/afters run', function() {});
|
||||
env.afterAll(function(innerDone) {
|
||||
innerDone();
|
||||
innerDone();
|
||||
});
|
||||
});
|
||||
|
||||
env.execute(null, function() {
|
||||
var warnings;
|
||||
expect(reporter.jasmineDone).toHaveBeenCalled();
|
||||
warnings = reporter.jasmineDone.calls.argsFor(0)[0].deprecationWarnings;
|
||||
expect(warnings.length).toEqual(2);
|
||||
expect(warnings[0])
|
||||
.withContext('suite beforeAll')
|
||||
.toEqual(
|
||||
jasmine.objectContaining({
|
||||
message: message + '\n(in suite: a suite)'
|
||||
})
|
||||
);
|
||||
expect(warnings[1])
|
||||
.withContext('suite afterAll')
|
||||
.toEqual(
|
||||
jasmine.objectContaining({
|
||||
message: message + '\n(in suite: a suite)'
|
||||
})
|
||||
);
|
||||
done();
|
||||
});
|
||||
});
|
||||
|
||||
it('deprecates multiple calls to done in a spec', function(done) {
|
||||
var reporter = jasmine.createSpyObj('fakeReporter', ['jasmineDone']);
|
||||
var message =
|
||||
"An asynchronous function called its 'done' " +
|
||||
'callback more than once. This is a bug in the spec, beforeAll, ' +
|
||||
'beforeEach, afterAll, or afterEach function in question. This will ' +
|
||||
'be treated as an error in a future version.\n' +
|
||||
'(in spec: a suite a spec)';
|
||||
|
||||
spyOn(console, 'error');
|
||||
env.addReporter(reporter);
|
||||
env.configure({ verboseDeprecations: true });
|
||||
env.describe('a suite', function() {
|
||||
env.beforeEach(function(innerDone) {
|
||||
innerDone();
|
||||
innerDone();
|
||||
});
|
||||
env.it('a spec', function(innerDone) {
|
||||
innerDone();
|
||||
innerDone();
|
||||
});
|
||||
env.afterEach(function(innerDone) {
|
||||
innerDone();
|
||||
innerDone();
|
||||
});
|
||||
});
|
||||
|
||||
env.execute(null, function() {
|
||||
var warnings;
|
||||
expect(reporter.jasmineDone).toHaveBeenCalled();
|
||||
warnings = reporter.jasmineDone.calls.argsFor(0)[0].deprecationWarnings;
|
||||
expect(warnings.length).toEqual(3);
|
||||
expect(warnings[0])
|
||||
.withContext('warning caused by beforeEach')
|
||||
.toEqual(jasmine.objectContaining({ message: message }));
|
||||
expect(warnings[1])
|
||||
.withContext('warning caused by it')
|
||||
.toEqual(jasmine.objectContaining({ message: message }));
|
||||
expect(warnings[2])
|
||||
.withContext('warning caused by afterEach')
|
||||
.toEqual(jasmine.objectContaining({ message: message }));
|
||||
done();
|
||||
});
|
||||
});
|
||||
|
||||
it('deprecates multiple calls to done in reporters', function(done) {
|
||||
var message =
|
||||
"An asynchronous reporter callback called its 'done' callback more " +
|
||||
'than once. This is a bug in the reporter callback in question. This ' +
|
||||
'will be treated as an error in a future version.\nNote: This message ' +
|
||||
'will be shown only once. Set config.verboseDeprecations to true to ' +
|
||||
'see every occurrence.';
|
||||
var reporter = jasmine.createSpyObj('fakeReport', ['jasmineDone']);
|
||||
reporter.specDone = function(result, done) {
|
||||
done();
|
||||
done();
|
||||
};
|
||||
env.addReporter(reporter);
|
||||
|
||||
env.it('a spec', function() {});
|
||||
|
||||
spyOn(console, 'error');
|
||||
env.execute(null, function() {
|
||||
expect(reporter.jasmineDone).toHaveBeenCalled();
|
||||
warnings = reporter.jasmineDone.calls.argsFor(0)[0].deprecationWarnings;
|
||||
expect(warnings.length).toEqual(1);
|
||||
expect(warnings[0]).toEqual(
|
||||
jasmine.objectContaining({ message: message })
|
||||
);
|
||||
done();
|
||||
});
|
||||
});
|
||||
|
||||
it('does not deprecate a call to done that comes after a timeout', function(done) {
|
||||
var reporter = jasmine.createSpyObj('fakeReporter', ['jasmineDone']),
|
||||
firstSpecDone;
|
||||
|
||||
reporter.specDone = function(result, reporterDone) {
|
||||
setTimeout(function() {
|
||||
firstSpecDone();
|
||||
reporterDone();
|
||||
});
|
||||
};
|
||||
env.addReporter(reporter);
|
||||
|
||||
env.it(
|
||||
'a spec',
|
||||
function(innerDone) {
|
||||
firstSpecDone = innerDone;
|
||||
},
|
||||
1
|
||||
);
|
||||
|
||||
env.execute(null, function() {
|
||||
expect(reporter.jasmineDone).toHaveBeenCalledWith(
|
||||
jasmine.objectContaining({
|
||||
deprecationWarnings: []
|
||||
})
|
||||
);
|
||||
done();
|
||||
});
|
||||
});
|
||||
|
||||
describe('suiteDone reporting', function() {
|
||||
it('reports when an afterAll fails an expectation', function(done) {
|
||||
var reporter = jasmine.createSpyObj('fakeReport', ['suiteDone']);
|
||||
@@ -1197,10 +1382,6 @@ describe('Env integration', function() {
|
||||
});
|
||||
|
||||
it('should wait a custom interval before reporting async functions that fail to complete', function(done) {
|
||||
if (jasmine.getEnv().skipBrowserFlake) {
|
||||
jasmine.getEnv().skipBrowserFlake();
|
||||
}
|
||||
|
||||
createMockedEnv();
|
||||
var reporter = jasmine.createSpyObj('fakeReport', [
|
||||
'jasmineDone',
|
||||
@@ -2519,7 +2700,7 @@ describe('Env integration', function() {
|
||||
return setTimeout(fn, delay);
|
||||
},
|
||||
clearTimeout: function(fn, delay) {
|
||||
clearTimeout(fn, delay);
|
||||
return clearTimeout(fn, delay);
|
||||
}
|
||||
};
|
||||
spyOn(jasmineUnderTest, 'getGlobal').and.returnValue(global);
|
||||
@@ -2774,6 +2955,10 @@ describe('Env integration', function() {
|
||||
});
|
||||
|
||||
it('provides custom equality testers to async matchers', function(done) {
|
||||
if (jasmine.getEnv().skipBrowserFlake) {
|
||||
jasmine.getEnv().skipBrowserFlake();
|
||||
}
|
||||
|
||||
jasmine.getEnv().requirePromises();
|
||||
|
||||
var specDone = jasmine.createSpy('specDone');
|
||||
|
||||
Reference in New Issue
Block a user