Merge pull request #503 from qawolf/default-to-headed

Improve cli
qawolf · Mar 10, 2020 · f75f889 · f75f889
2 parents 11df539 + 8ec0dd5
commit f75f889
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 5 deletions.
diff --git a/src/cli/cli.ts b/src/cli/cli.ts
@@ -18,8 +18,9 @@ program.usage('<command> [options]').version(pkg.version);
 addCiCommands({ program, qawolf: true });
 
 program
-  .command('create <url> [name]')
+  .command('create [url] [name]')
   .option('-d, --device <device>', 'emulate using a playwright.device')
+  .option('--name [name]', 'name', '')
   .option(
     '-r, --rootDir <rootDir>',
     'directory where test or script will be saved',
@@ -29,11 +30,13 @@ program
     '--statePath <statePath>',
     'path where state data (cookies, localStorage, sessionStorage) is saved',
   )
+  .option('--url [url]', 'url', 'http://example.org')
   .description('create a test from browser actions')
 
-  .action(async (urlArgument, optionalName, cmd) => {
-    const url = parseUrl(urlArgument);
-    const name = optionalName || (url.hostname || '').replace(/\..*/g, '');
+  .action(async (urlArgument, nameArgument, cmd) => {
+    const url = parseUrl(cmd.url || urlArgument);
+    const name =
+      cmd.name || nameArgument || (url.hostname || '').replace(/\..*/g, '');
 
     const codePath = await saveTemplate({
       device: cmd.device,
@@ -80,6 +83,7 @@ program
   .option('--all-browsers', 'run tests on chromium, firefox, and webkit')
   .option('--chromium', 'run tests on chromium')
   .option('--firefox', 'run tests on firefox')
+  .option('--headless', 'run tests headless')
   .option('--repl', 'open a REPL when repl() is called')
   .option('--webkit', 'run tests on webkit')
   .description('run a test with Jest')
@@ -89,6 +93,7 @@ program
       '--all-browsers',
       '--chromium',
       '--firefox',
+      '--headless',
       '--repl',
       '--webkit',
     ]);
@@ -110,6 +115,7 @@ program
     try {
       runJest(args, {
         browsers,
+        headless: !!cmd.headless,
         repl: !!cmd.repl,
         rootDir: cmd.rootDir,
       });

diff --git a/src/cli/run.ts b/src/cli/run.ts
@@ -5,6 +5,7 @@ type RunJestOptions = {
   browsers?: BrowserName[];
   config?: string;
   env?: NodeJS.ProcessEnv;
+  headless?: boolean;
   repl?: boolean;
   rootDir?: string;
 };
@@ -32,7 +33,13 @@ export const runJest = (
   /**
    * Returns exit code. 0 for success, 1 for failed.
    */
-  let command = `npx jest`;
+  let command = '';
+
+  if (!options.headless) {
+    command += 'QAW_HEADLESS=false ';
+  }
+
+  command += `npx jest`;
 
   if (!args.some(arg => arg.startsWith('--config'))) {
     // prevent using the local jest config