From e3a896bf40369b10e825109efaa0cee067a495a9 Mon Sep 17 00:00:00 2001
From: Johan Lorenzo <jlorenzo@mozilla.com>
Date: Tue, 24 May 2016 20:27:13 +0200
Subject: [PATCH] [js] Marionette support: Remove dev edition enforcement
 (#2135)

---
 javascript/node/selenium-webdriver/CHANGES.md       |  1 +
 javascript/node/selenium-webdriver/firefox/index.js | 10 ++--------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/javascript/node/selenium-webdriver/CHANGES.md b/javascript/node/selenium-webdriver/CHANGES.md
index 82b273c0e5ba4..8b50a20fbaed6 100644
--- a/javascript/node/selenium-webdriver/CHANGES.md
+++ b/javascript/node/selenium-webdriver/CHANGES.md
@@ -5,6 +5,7 @@
 * Added new wait conditions: `until.urlIs()`, `until.urlContains()`,
    `until.urlMatches()`
 * Added work around for [GeckoDriver bug](https://bugzilla.mozilla.org/show_bug.cgi?id=1274924) raising a type conversion error
+* Removed the mandatory use of Firefox Dev Edition, when using Marionette driver
 
 ## v2.53.2
 
diff --git a/javascript/node/selenium-webdriver/firefox/index.js b/javascript/node/selenium-webdriver/firefox/index.js
index 2ccc28e2fe1b0..6689401093783 100644
--- a/javascript/node/selenium-webdriver/firefox/index.js
+++ b/javascript/node/selenium-webdriver/firefox/index.js
@@ -275,14 +275,8 @@ function findGeckoDriver() {
  * @return {!remote.DriverService} .
  */
 function createGeckoDriverService(binary) {
-    // Firefox's Developer Edition is currently required for Marionette.
-  let exe;
-  if (typeof binary === 'string') {
-    exe = Promise.resolve(binary);
-  } else {
-    binary.useDevEdition();
-    exe = binary.locate();
-  }
+  let exe = typeof binary === 'string' ?
+    Promise.resolve(binary) : binary.locate();
 
   let geckoDriver = findGeckoDriver();
   let port =  portprober.findFreePort();