fix: Add supported choices to --target option (#1644)

mozilla · Jul 11, 2019 · 739aa52 · 739aa52
1 parent 72bb28c
commit 739aa52
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/src/program.js b/src/program.js
@@ -436,12 +436,12 @@ Example: $0 --help run.
     .command('run', 'Run the extension', commands.run, {
       'target': {
         alias: 't',
-        describe: 'The extensions runners to enable (e.g. firefox-desktop, ' +
-                  'firefox-android). Specify this option multiple times to ' +
-                  'run against multiple targets.',
+        describe: 'The extensions runners to enable. Specify this option ' +
+                  'multiple times to run against multiple targets.',
         default: 'firefox-desktop',
         demandOption: false,
         type: 'array',
+        choices: ['firefox-desktop', 'firefox-android'],
       },
       'firefox': {
         alias: ['f', 'firefox-binary'],

diff --git a/tests/functional/test.cli.run.js b/tests/functional/test.cli.run.js
@@ -1,5 +1,6 @@
 /* @flow */
 import {describe, it} from 'mocha';
+import {assert} from 'chai';
 
 import {
   minimalAddonPath, fakeFirefoxPath,
@@ -47,4 +48,19 @@ describe('web-ext run', () => {
            }
          });
        }));
+
+  it('should not accept: --target INVALIDTARGET', async () => {
+    const argv = [
+      'run',
+      '--target', 'firefox-desktop',
+      '--target', 'not-supported',
+      '--target', 'firefox-android',
+    ];
+
+    return execWebExt(argv, {}).waitForExit.then(({exitCode, stderr}) => {
+      assert.notEqual(exitCode, 0);
+      assert.match(stderr, /Invalid values/);
+      assert.match(stderr, /Given: "not-supported"/);
+    });
+  });
 });