ALL - default config to null

Better config handling. If a non existing path is passed as config throw error
qlik-oss · Nov 13, 2017 · 04f3bd4 · 04f3bd4
1 parent 9274eae
commit 04f3bd4
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 6 deletions.
diff --git a/src/cdp/index.js b/src/cdp/index.js
@@ -32,6 +32,9 @@ const cdp = {
     return yargs
       .options(options)
       .config('config', (configPath) => {
+        if (configPath === null) {
+          return {};
+        }
         if (!fs.existsSync(configPath)) {
           throw new Error(`Config ${configPath} not found`);
         }

diff --git a/src/cdp/options.js b/src/cdp/options.js
@@ -2,7 +2,7 @@ module.exports = {
   config: {
     description: 'Path to config file',
     type: 'string',
-    default: 'aw.config.js',
+    default: null,
     alias: 'c',
   },
   url: {

diff --git a/src/node/index.js b/src/node/index.js
@@ -54,6 +54,9 @@ const node = {
     return yargs
       .options(options)
       .config('config', (configPath) => {
+        if (configPath === null) {
+          return {};
+        }
         if (!fs.existsSync(configPath)) {
           throw new Error(`Config ${configPath} not found`);
         }

diff --git a/src/node/options.js b/src/node/options.js
@@ -2,7 +2,7 @@ module.exports = {
   config: {
     description: 'Path to config file',
     type: 'string',
-    default: 'aw.config.js',
+    default: null,
     alias: 'c',
   },
   glob: {

diff --git a/src/protractor/options.js b/src/protractor/options.js
@@ -2,7 +2,7 @@ module.exports = {
   config: {
     description: 'Path to config file',
     type: 'string',
-    default: 'aw.config.js',
+    default: null,
     alias: 'c',
   },
   glob: {

diff --git a/src/protractor/utils.js b/src/protractor/utils.js
@@ -2,7 +2,6 @@
 const dns = require('dns');
 const os = require('os');
 const http = require('http');
-const path = require('path');
 
 module.exports = {
   getFullQualifiedDNSName() {

diff --git a/src/puppeteer/index.js b/src/puppeteer/index.js
@@ -29,6 +29,9 @@ const puppet = {
     return yargs
       .options(options)
       .config('config', (configPath) => {
+        if (configPath === null) {
+          return {};
+        }
         if (!fs.existsSync(configPath)) {
           throw new Error(`Config ${configPath} not found`);
         }

diff --git a/src/puppeteer/options.js b/src/puppeteer/options.js
@@ -2,7 +2,7 @@ module.exports = {
   config: {
     description: 'Path to config file',
     type: 'string',
-    default: 'aw.config.js',
+    default: null,
     alias: 'c',
   },
   glob: {

diff --git a/src/serve/index.js b/src/serve/index.js
@@ -11,7 +11,7 @@ const server = {
         config: {
           description: 'Path to config file',
           type: 'string',
-          default: 'aw.config.js',
+          default: null,
           alias: 'c',
         },
         port: {
@@ -31,6 +31,9 @@ const server = {
         },
       })
       .config('config', (configPath) => {
+        if (configPath === null) {
+          return {};
+        }
         if (!fs.existsSync(configPath)) {
           throw new Error(`Config ${configPath} not found`);
         }