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

feat(restart): browser.restart should return a promise #4008

Merged
merged 1 commit into from
Jan 26, 2017

Conversation

sjelin
Copy link
Contributor

@sjelin sjelin commented Jan 25, 2017

Also allows browser.restart to work when the control flow is disabled, and
fixes it for forked browsers.

Closes #3899 and
#3896

* @example
* // Running with control flow disabled
* var forked = await browser.forkNewDriverInstance().ready;
* await fork.get('page1'); // 'page1' gotten by forked browser
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be forked.get

* var savedBrowser = browser;
* browser.restart().then(function() {
* console.log(browser === savedBrowser); // false
* });
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this scenario is better captured by this example:

var savedBrowser = browser;
browser.get('foo').then(function() {
  console.log(browser === savedBrowser); // false
});
browser.restart();

@@ -113,7 +113,7 @@ export class Runner extends EventEmitter {
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();
this.restartPromise = this.restartPromise || q(protractor.browser.restart());
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove the TODO above.

Also allows `browser.restart` to work when the control flow is disabled, and
fixes it for forked browsers.

Closes angular#3899 and
angular#3896
@sjelin
Copy link
Contributor Author

sjelin commented Jan 26, 2017

@juliemr all comments addressed

@sjelin sjelin merged commit ed2534a into angular:noCF Jan 26, 2017
sjelin added a commit that referenced this pull request Jan 26, 2017
Also allows `browser.restart` to work when the control flow is disabled, and
fixes it for forked browsers.

Closes #3899 and
#3896
sjelin added a commit to sjelin/protractor that referenced this pull request Jan 27, 2017
Also allows `browser.restart` to work when the control flow is disabled, and
fixes it for forked browsers.

Closes angular#3899 and
angular#3896
igniteram pushed a commit to igniteram/protractor that referenced this pull request Feb 21, 2017
Also allows `browser.restart` to work when the control flow is disabled, and
fixes it for forked browsers.

Closes angular#3899 and
angular#3896
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants