diff --git a/src/cmd/run.js b/src/cmd/run.js index 7bab03927b..9d1a2f6f6d 100644 --- a/src/cmd/run.js +++ b/src/cmd/run.js @@ -93,6 +93,7 @@ export default async function run( target, args, firefoxPreview = [], + verbose = false, // Android CLI options. adbBin, adbHost, @@ -177,6 +178,7 @@ export default async function run( customPrefs, browserConsole, devtools, + verbose, preInstall, // Firefox runner injected dependencies. diff --git a/src/extension-runners/firefox-desktop.js b/src/extension-runners/firefox-desktop.js index e722999fb6..e2ada6782c 100644 --- a/src/extension-runners/firefox-desktop.js +++ b/src/extension-runners/firefox-desktop.js @@ -34,6 +34,7 @@ type FirefoxDesktopSpecificRunnerParams = {| customPrefs?: FirefoxPreferences, browserConsole: boolean, devtools: boolean, + verbose: boolean, firefoxBinary: string, preInstall: boolean, @@ -214,6 +215,7 @@ export class FirefoxDesktopExtensionRunner { const { browserConsole, devtools, + verbose, extensions, firefoxBinary, preInstall, @@ -243,6 +245,8 @@ export class FirefoxDesktopExtensionRunner { firefoxBinary, binaryArgs, extensions, + verbose, + devtools, }); this.runningInfo.firefox.on('close', () => { diff --git a/src/firefox/index.js b/src/firefox/index.js index 8a4e35aa66..c99ff30fe3 100644 --- a/src/firefox/index.js +++ b/src/firefox/index.js @@ -90,6 +90,8 @@ export type FirefoxRunOptions = { binaryArgs?: Array, args?: Array, extensions: Array, + devtools: boolean, + verbose: boolean, }; /* @@ -103,6 +105,8 @@ export async function run( firefoxBinary, binaryArgs, extensions, + devtools, + verbose, }: FirefoxRunOptions = {} ): Promise { @@ -164,9 +168,13 @@ export async function run( throw error; }); - log.info( - 'Use --verbose or open Tools > Web Developer > Browser Console ' + - 'to see logging'); + if (!verbose && !devtools) { + log.info('Use --verbose or --devtools to see logging'); + } + if (devtools) { + log.info('More info about WebExtension debugging:'); + log.info('https://extensionworkshop.com/documentation/develop/debugging/'); + } firefox.stderr.on('data', (data) => { log.debug(`Firefox stderr: ${data.toString().trim()}`); diff --git a/tests/functional/fake-firefox-binary.js b/tests/functional/fake-firefox-binary.js index 2f8690258d..00ffb3fe2e 100755 --- a/tests/functional/fake-firefox-binary.js +++ b/tests/functional/fake-firefox-binary.js @@ -9,6 +9,7 @@ const REQUEST_INSTALL_ADDON = { to: 'fakeAddonsActor', type: 'installTemporaryAddon', addonPath: process.env.addonPath, + openDevTools: false, // Introduced in Firefox 106 (Bug 1787409 / Bug 1789245) }; const REPLY_INSTALL_ADDON = { from: 'fakeAddonsActor',