Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[js] Marionette support: Remove dev edition enforcement #2135

Merged
merged 3 commits into from
May 24, 2016
Merged

[js] Marionette support: Remove dev edition enforcement #2135

merged 3 commits into from
May 24, 2016

Conversation

JohanLorenzo
Copy link
Contributor

Follow up on 185755a. Firefox 46 is now in the release channel. We don't need to rely on Dev Edition by default anymore.

I tested this removal on Mac OS X against Firefox Beta (currently 47, it'll enter release on June 7th). git grep useDevEdition didn't return any other place where it was used.

Would you like to review @jleyba @AutomatedTester ?

if (typeof binary === 'string') {
exe = Promise.resolve(binary);
} else {
binary.useDevEdition();
Copy link
Contributor

Choose a reason for hiding this comment

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

This is the only line you should remove (forcing users to dev edition for marionette). Users should still be able to opt-in to the dev edition if they want it.

Copy link
Contributor Author

@JohanLorenzo JohanLorenzo May 20, 2016

Choose a reason for hiding this comment

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

Works for me! Done.

@jleyba
Copy link
Contributor

jleyba commented May 20, 2016

Could you add a point to CHANGES.md? I try to keep that in sync with changes.

@jleyba
Copy link
Contributor

jleyba commented May 24, 2016

Sorry, I merged your PRs in the wrong order. Mind fixing the merge conflicts?

@JohanLorenzo
Copy link
Contributor Author

No problem! Done.

@jleyba jleyba merged commit e3a896b into SeleniumHQ:master May 24, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants