Merge pull request #1 from avaly/fix/support-config-argument

Support config CLI flag

Author: xfumihiro

lib/index.js

@@ -9,6 +9,14 @@ var _puppeteer = require('puppeteer');
 
 var _puppeteer2 = _interopRequireDefault(_puppeteer);
 
+var _path = require('path');
+
+var _path2 = _interopRequireDefault(_path);
+
+var _yargs = require('yargs');
+
+var _yargs2 = _interopRequireDefault(_yargs);
+
 var _get_puppeteer_config = require('./get_puppeteer_config');
 
 var _get_puppeteer_config2 = _interopRequireDefault(_get_puppeteer_config);
@@ -19,14 +27,37 @@ const PATH = './node_modules/jest-puppeteer/';
 const PUPPETEER_ENVIRONMENT = PATH + 'puppeteer_environment.js';
 const RESULT_PROCESSOR = PATH + 'result_processor.js';
 
+function cleanArgv(argv) {
+  const clean = argv.slice(0);
+  argv.forEach((arg, index) => {
+    if (arg.indexOf('--config=') === 0 || arg.indexOf('-c=') === 0) {
+      clean.splice(index, 1);
+    } else if (arg.indexOf('--config') === 0 || arg.indexOf('-c') === 0) {
+      clean.splice(index, 2);
+    }
+  });
+  return clean;
+}
+
 console.log(_chalk2.default.green('Setup Puppeteer Environment.'));
 _puppeteer2.default.launch((0, _get_puppeteer_config2.default)()).then(browser => {
   global.__BROWSER__ = browser;
-  process.argv = process.argv.concat([`--env=${PUPPETEER_ENVIRONMENT}`, '--config=' + JSON.stringify({
+
+  const args = (0, _yargs2.default)(process.argv.slice(2)).options({
+    config: {
+      alias: 'c',
+      type: 'string'
+    }
+  }).argv;
+  const config = args.config ? require(_path2.default.resolve(args.config)) : {};
+  const cleanedArgv = cleanArgv(process.argv);
+
+  process.argv = cleanedArgv.concat([`--env=${PUPPETEER_ENVIRONMENT}`, '--config=' + JSON.stringify(Object.assign({}, config, {
     globals: {
       browserWSEndpoint: browser.wsEndpoint()
     },
     testResultsProcessor: RESULT_PROCESSOR
-  })]);
+  }))]);
+
   return require('jest-cli/bin/jest.js');
 });

package.json

@@ -18,7 +18,7 @@
     "result_processor.js"
   ],
   "dependencies": {
-    "chalk": "^2.1.0"   
+    "chalk": "^2.1.0"
   },
   "devDependencies": {
     "babel-cli": "^6.26.0",
@@ -28,6 +28,7 @@
   },
   "peerDependencies": {
     "jest": "21.3.0-beta.2",
-    "puppeteer": "^0.12.0"    
+    "puppeteer": "^0.12.0",
+    "yargs": "^9.0.0"
   }
 }

src/index.js

@@ -1,25 +1,50 @@
 #!/usr/bin/env node
 import chalk from 'chalk'
 import puppeteer from 'puppeteer'
+import path from 'path'
+import yargs from 'yargs'
 import getPuppeteerConfig from './get_puppeteer_config'
 
 const PATH = './node_modules/jest-puppeteer/'
 const PUPPETEER_ENVIRONMENT = PATH + 'puppeteer_environment.js'
 const RESULT_PROCESSOR = PATH + 'result_processor.js'
 
+function cleanArgv(argv) {
+  const clean = argv.slice(0);
+  argv.forEach((arg, index) => {
+    if (arg.indexOf('--config=') === 0 || arg.indexOf('-c=') === 0) {
+      clean.splice(index, 1);
+    } else if (arg.indexOf('--config') === 0 || arg.indexOf('-c') === 0) {
+      clean.splice(index, 2);
+    }
+  });
+  return clean;
+}
+
 console.log(chalk.green('Setup Puppeteer Environment.'))
 puppeteer
   .launch(getPuppeteerConfig())
   .then(browser => {
     global.__BROWSER__ = browser
-    process.argv = process.argv.concat([
+
+    const args = yargs(process.argv.slice(2)).options({
+      config: {
+        alias: 'c',
+        type: 'string'
+      },
+    }).argv;
+    const config = args.config ? require(path.resolve(args.config)) : {}
+    const cleanedArgv = cleanArgv(process.argv);
+
+    process.argv = cleanedArgv.concat([
       `--env=${PUPPETEER_ENVIRONMENT}`,
-      '--config=' + JSON.stringify({
+      '--config=' + JSON.stringify(Object.assign({}, config, {
         globals: {
           browserWSEndpoint: browser.wsEndpoint()
         },
         testResultsProcessor: RESULT_PROCESSOR
-      })
+      }))
     ])
+
     return require('jest-cli/bin/jest.js')
   })