Skip to content
This repository was archived by the owner on Jul 29, 2024. It is now read-only.

chore(frameworks): allow frameworks to call afterEach. #3906

Merged
merged 1 commit into from
Jan 18, 2017
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 27 additions & 1 deletion lib/runner.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ export class Runner extends EventEmitter {
driverprovider_: DriverProvider;
o: any;
plugins_: Plugins;
restartPromise: q.Promise<any>;
frameworkUsesAfterEach: boolean;

constructor(config: Config) {
super();
Expand Down Expand Up @@ -86,6 +88,26 @@ export class Runner extends EventEmitter {
});
}

/**
* Called after each test finishes.
*
* Responsible for `restartBrowserBetweenTests`
*
* @public
* @return {q.Promise} A promise that will resolve when the work here is done
*/
afterEach(): q.Promise<void> {
let ret: q.Promise<void>;
this.frameworkUsesAfterEach = true;
if (this.config_.restartBrowserBetweenTests) {
// TODO(sjelin): remove the `|| q()` once `restart()` returns a promise
this.restartPromise = this.restartPromise || protractor.browser.restart() || q();
ret = this.restartPromise;
this.restartPromise = undefined;
}
return ret || q();
}

/**
* Grab driver provider based on type
* @private
Expand Down Expand Up @@ -325,8 +347,12 @@ export class Runner extends EventEmitter {
}

if (this.config_.restartBrowserBetweenTests) {
// TODO(sjelin): replace with warnings once `afterEach` support is required
let restartDriver = () => {
browser_.restart();
if (!this.frameworkUsesAfterEach) {
// TODO(sjelin): remove the `|| q()` once `restart()` returns a promise
this.restartPromise = browser_.restart() || q();
}
};
this.on('testPass', restartDriver);
this.on('testFail', restartDriver);
Expand Down