fix: firefox binary path not passed in the run method exported by 'sr…

…c/firefox/index'.
mozilla · Sep 6, 2016 · 48bbd7b · 48bbd7b
1 parent c95991d
commit 48bbd7b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/cmd/run.js b/src/cmd/run.js
@@ -333,6 +333,6 @@ export class ExtensionRunner {
 
   run(profile: FirefoxProfile): Promise<FirefoxProcess> {
     const {firefoxApp, firefox} = this;
-    return firefoxApp.run(profile, {firefox});
+    return firefoxApp.run(profile, {firefoxBinary: firefox || null});
   }
 }
diff --git a/src/firefox/index.js b/src/firefox/index.js
@@ -74,7 +74,7 @@ export function defaultRemotePortFinder(
 // Declare the needed 'fx-runner' module flow types.
 
 export type FirefoxRunnerParams = {
-  binary?: string,
+  binary: ?string,
   profile?: string,
   'new-instance'?: boolean,
   'no-remote'?: boolean,
@@ -105,7 +105,7 @@ export type FirefoxRunnerFn =
 export type FirefoxRunOptions = {
   fxRunner?: FirefoxRunnerFn,
   findRemotePort?: RemotePortFinderFn,
-  firefoxBinary?: string,
+  firefoxBinary: ?string,
   binaryArgs?: Array<string>,
 };
 

diff --git a/tests/test-cmd/test.run.js b/tests/test-cmd/test.run.js
@@ -120,7 +120,7 @@ describe('run', () => {
 
     return cmd.run({firefox}).then(() => {
       assert.equal(firefoxApp.run.called, true);
-      assert.equal(firefoxApp.run.firstCall.args[1].firefox,
+      assert.equal(firefoxApp.run.firstCall.args[1].firefoxBinary,
                    firefox);
     });
   });