This repository has been archived by the owner on Jul 29, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 2.3k
feat(restart): browser.restart
should return a promise
#4008
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
juliemr
reviewed
Jan 26, 2017
* @example | ||
* // Running with control flow disabled | ||
* var forked = await browser.forkNewDriverInstance().ready; | ||
* await fork.get('page1'); // 'page1' gotten by forked browser |
There was a problem hiding this comment.
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 | ||
* }); |
There was a problem hiding this comment.
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()); |
There was a problem hiding this comment.
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
@juliemr all comments addressed |
juliemr
approved these changes
Jan 26, 2017
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.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Also allows
browser.restart
to work when the control flow is disabled, andfixes it for forked browsers.
Closes #3899 and
#3896