Breaking change: Env#execute no longer takes a callback
Use the returned promise instead.
This commit is contained in:
@@ -1638,18 +1638,12 @@ getJasmineRequireObj().Env = function(j$) {
|
|||||||
/**
|
/**
|
||||||
* Executes the specs.
|
* Executes the specs.
|
||||||
*
|
*
|
||||||
* If called with no parameters or with a falsy value as the first parameter,
|
* If called with no parameter or with a falsy parameter,
|
||||||
* all specs will be executed except those that are excluded by a
|
* all specs will be executed except those that are excluded by a
|
||||||
* [spec filter]{@link Configuration#specFilter} or other mechanism. If the
|
* [spec filter]{@link Configuration#specFilter} or other mechanism. If the
|
||||||
* first parameter is a list of spec/suite IDs, only those specs/suites will
|
* parameter is a list of spec/suite IDs, only those specs/suites will
|
||||||
* be run.
|
* be run.
|
||||||
*
|
*
|
||||||
* Both parameters are optional, but a completion callback is only valid as
|
|
||||||
* the second parameter. To specify a completion callback but not a list of
|
|
||||||
* specs/suites to run, pass null or undefined as the first parameter. The
|
|
||||||
* completion callback is supported for backward compatibility. In most
|
|
||||||
* cases it will be more convenient to use the returned promise instead.
|
|
||||||
*
|
|
||||||
* execute should not be called more than once unless the env has been
|
* execute should not be called more than once unless the env has been
|
||||||
* configured with `{autoCleanClosures: false}`.
|
* configured with `{autoCleanClosures: false}`.
|
||||||
*
|
*
|
||||||
@@ -1663,19 +1657,11 @@ getJasmineRequireObj().Env = function(j$) {
|
|||||||
* @since 2.0.0
|
* @since 2.0.0
|
||||||
* @function
|
* @function
|
||||||
* @param {(string[])=} runablesToRun IDs of suites and/or specs to run
|
* @param {(string[])=} runablesToRun IDs of suites and/or specs to run
|
||||||
* @param {Function=} onComplete Function that will be called after all specs have run
|
|
||||||
* @return {Promise<JasmineDoneInfo>}
|
* @return {Promise<JasmineDoneInfo>}
|
||||||
*/
|
*/
|
||||||
this.execute = function(runablesToRun, onComplete) {
|
this.execute = function(runablesToRun) {
|
||||||
installGlobalErrors();
|
installGlobalErrors();
|
||||||
|
return runner.execute(runablesToRun);
|
||||||
return runner.execute(runablesToRun).then(function(jasmineDoneInfo) {
|
|
||||||
if (onComplete) {
|
|
||||||
onComplete();
|
|
||||||
}
|
|
||||||
|
|
||||||
return jasmineDoneInfo;
|
|
||||||
});
|
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -3670,16 +3670,6 @@ describe('Env integration', function() {
|
|||||||
expect(failedExpectations).toEqual([]);
|
expect(failedExpectations).toEqual([]);
|
||||||
});
|
});
|
||||||
|
|
||||||
it('calls the optional done callback when finished', function(done) {
|
|
||||||
const reporter = jasmine.createSpyObj('reporter', ['jasmineDone']);
|
|
||||||
env.addReporter(reporter);
|
|
||||||
|
|
||||||
env.execute(null, function() {
|
|
||||||
expect(reporter.jasmineDone).toHaveBeenCalled();
|
|
||||||
done();
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe('#spyOnGlobalErrorsAsync', function() {
|
describe('#spyOnGlobalErrorsAsync', function() {
|
||||||
const leftInstalledMessage =
|
const leftInstalledMessage =
|
||||||
'Global error spy was not uninstalled. ' +
|
'Global error spy was not uninstalled. ' +
|
||||||
|
|||||||
@@ -496,18 +496,12 @@ getJasmineRequireObj().Env = function(j$) {
|
|||||||
/**
|
/**
|
||||||
* Executes the specs.
|
* Executes the specs.
|
||||||
*
|
*
|
||||||
* If called with no parameters or with a falsy value as the first parameter,
|
* If called with no parameter or with a falsy parameter,
|
||||||
* all specs will be executed except those that are excluded by a
|
* all specs will be executed except those that are excluded by a
|
||||||
* [spec filter]{@link Configuration#specFilter} or other mechanism. If the
|
* [spec filter]{@link Configuration#specFilter} or other mechanism. If the
|
||||||
* first parameter is a list of spec/suite IDs, only those specs/suites will
|
* parameter is a list of spec/suite IDs, only those specs/suites will
|
||||||
* be run.
|
* be run.
|
||||||
*
|
*
|
||||||
* Both parameters are optional, but a completion callback is only valid as
|
|
||||||
* the second parameter. To specify a completion callback but not a list of
|
|
||||||
* specs/suites to run, pass null or undefined as the first parameter. The
|
|
||||||
* completion callback is supported for backward compatibility. In most
|
|
||||||
* cases it will be more convenient to use the returned promise instead.
|
|
||||||
*
|
|
||||||
* execute should not be called more than once unless the env has been
|
* execute should not be called more than once unless the env has been
|
||||||
* configured with `{autoCleanClosures: false}`.
|
* configured with `{autoCleanClosures: false}`.
|
||||||
*
|
*
|
||||||
@@ -521,19 +515,11 @@ getJasmineRequireObj().Env = function(j$) {
|
|||||||
* @since 2.0.0
|
* @since 2.0.0
|
||||||
* @function
|
* @function
|
||||||
* @param {(string[])=} runablesToRun IDs of suites and/or specs to run
|
* @param {(string[])=} runablesToRun IDs of suites and/or specs to run
|
||||||
* @param {Function=} onComplete Function that will be called after all specs have run
|
|
||||||
* @return {Promise<JasmineDoneInfo>}
|
* @return {Promise<JasmineDoneInfo>}
|
||||||
*/
|
*/
|
||||||
this.execute = function(runablesToRun, onComplete) {
|
this.execute = function(runablesToRun) {
|
||||||
installGlobalErrors();
|
installGlobalErrors();
|
||||||
|
return runner.execute(runablesToRun);
|
||||||
return runner.execute(runablesToRun).then(function(jasmineDoneInfo) {
|
|
||||||
if (onComplete) {
|
|
||||||
onComplete();
|
|
||||||
}
|
|
||||||
|
|
||||||
return jasmineDoneInfo;
|
|
||||||
});
|
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
Reference in New Issue
Block a user