Use alternative flow to handle env variables

detox/local-cli/detox-test.js

@@ -34,30 +34,37 @@ const {
   cleanup,
   reuse,
   debugSynchronization,
-  artifactsLocation,
+  artifactsLocation
 } = program;
 
 switch (runner) {
   case 'mocha':
-    command = `node_modules/.bin/${runner} ${testFolder} --opts ${testFolder}/${program.runnerConfig}`;
-    break;
-  case 'jest':
-    command = `node_modules/.bin/${runner} ${testFolder} --runInBand`;
+    const loglevel = program.loglevel ? `--loglevel ${program.loglevel}` : '';		 +let runner = config.runner || 'mocha';
+    const configuration = program.configuration ? `--configuration ${program.configuration}` : '';
+    const cleanup = program.cleanup ? `--cleanup` : '';
+    const reuse = program.reuse ? `--reuse` : '';
+    const artifactsLocation = program.artifactsLocation ? `--artifacts-location ${program.artifactsLocation}` : '';
+    command = `node_modules/.bin/${program.runner} ${testFolder} --opts ${testFolder}/${program.runnerConfig} ${configuration} ${loglevel} ${cleanup} ${reuse} ${debugSynchronization} ${artifactsLocation}`;
+
+    console.log(command);
+    cp.execSync(command, { stdio: 'inherit' });
     break;
-  default:
+    case 'jest':
+      command = `node_modules/.bin/${runner} ${testFolder} --runInBand`;
+      console.log(command);
+      cp.execSync(command, {
+        stdio: 'inherit',
+        env: {
+          ...process.env,
+          configuration,
+          loglevel,
+          cleanup,
+          reuse,
+          debugSynchronization,
+          artifactsLocation
+        }
+      });
+      break;
+    default:
     throw new Error(`${runner} is not supported in detox cli tools. You can still run your tests with the runner's own cli tool`);
 }
-
-console.log(command);
-cp.execSync(command, {
-  stdio: 'inherit',
-  env: {
-    ...process.env,
-    configuration,
-    loglevel,
-    cleanup,
-    reuse,
-    debugSynchronization,
-    artifactsLocation,
-  },
-});

detox/package.json

@@ -42,6 +42,7 @@
     "eslint-plugin-react": "^7.1.0",
     "eslint-plugin-react-native": "^2.3.2",
     "jest": "^20.0.4",
+    "minimist": "^1.2.0",
     "mockdate": "^2.0.1",
     "shelljs": "^0.7.3",
     "ttab": "^0.3.1"

detox/src/utils/argparse.js

@@ -1,5 +1,7 @@
+const argv = require('minimist')(process.argv.slice(2));
+
 function getArgValue(key) {
-  return process.env[key];
+  return (argv && argv[key]) ? argv[key] : process.env[key];
 }
 
 module.exports = {

detox/src/utils/argparse.test.js

@@ -1,18 +1,39 @@
 jest.unmock('process');
 
 describe('argparse', () => {
-  let argparse;
+  describe('using env variables', () => {
+    let argparse;
 
-  beforeEach(() => {
-    process.env.test = 'a value';
-    argparse = require('./argparse');
-  });
+    beforeEach(() => {
+      process.env.test = 'a value';
+      argparse = require('./argparse');
+    });
+
+    it(`nonexistent key should return undefined result`, () => {
+      expect(argparse.getArgValue('blah')).not.toBeDefined();
+    });
 
-  it(`nonexistent key should return undefined result`, () => {
-    expect(argparse.getArgValue('blah')).not.toBeDefined();
+    it(`existing key should return a result`, () => {
+      expect(argparse.getArgValue('test')).toBe('a value');
+    });
   });
 
-  it(`existing key should return a result`, () => {
-    expect(argparse.getArgValue('test')).toBe('a value');
+  describe('using arguments', () => {
+    let argparse;
+
+    beforeEach(() => {
+      jest.mock('minimist');
+      const minimist = require('minimist');
+      minimist.mockReturnValue({test: 'a value'});
+      argparse = require('./argparse');
+    });
+
+    it(`nonexistent key should return undefined result`, () => {
+      expect(argparse.getArgValue('blah')).not.toBeDefined();
+    });
+
+    it(`existing key should return a result`, () => {
+      expect(argparse.getArgValue('test')).toBe('a value');
+    });
   });
 });