🔧 fix 🐅 s and process lint warnings

plotly · Jul 15, 2016 · 2ed9b1f · 2ed9b1f
1 parent cf365ff
commit 2ed9b1f
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 16 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -64,7 +64,7 @@
             "no-new-wrappers": [2],
             "no-new": [2],
             "no-param-reassign": [1],
-            "no-process-env": [1],
+            "no-process-env": [0],
             "no-proto": [2],
             "no-redeclare": [1],
             "no-return-assign": [2],

diff --git a/args.js b/args.js
@@ -37,6 +37,7 @@ const defaultOptions = () => {
     }));
 };
 
+// args are expected to be in ['key=value', 'key1=value2' ...] format
 function mergeArgs (args) {
     const userOptions = {};
 
@@ -84,9 +85,8 @@ function mergeArgs (args) {
         `Valid values for this key are: ${optionsBook[arg[0]].acceptedValues}`;
     };
 
-    // args are expected to be in ['key=value', 'key1=value2' ...] format
     try {
-        if (!isEmpty(args)) {
+        if (!isEmpty(args) && !contains('--test-type=webdriver', args)) {
             args.forEach( expression => {
                 const arg = split('=', expression);
                 const parsedArg = parseArgValue(arg);
@@ -101,18 +101,27 @@ function mergeArgs (args) {
                 }
             });
         }
-
     } catch (error) {
+        // keep this console log for the user running it from the CL
+        console.error(error);
         process.exit(-1);
-
-    } finally {
-        return merge(defaultOptions(), userOptions);
     }
+    return merge(defaultOptions(), userOptions);
 }
 
 // if in development mode, just pass in an empty args object => defaults all
 const acceptedArgs = () => {
-    return process.env.NODE_ENV === 'development' ? {} : process.argv.slice(2);
+
+    let argsToMerge = [];
+
+    if (process.env.NODE_ENV === 'development') {
+        argsToMerge = ['logdetail=2'];
+    } else if (!contains('./test/e2e.js', process.argv.slice(2))) {
+        argsToMerge = process.argv.slice(2);
+    }
+
+    return argsToMerge;
+
 };
 
 export const ARGS = mergeArgs(acceptedArgs());
diff --git a/main.development.js b/main.development.js
@@ -47,9 +47,6 @@ app.on('ready', () => {
     function log(logEntry, code = 2) {
 
         // default log detail set to 1 (warn level) in ./args.js
-
-        console.log(code, logEntry);
-
         if (code <= OPTIONS.logdetail) {
             switch (code) {
                 case 0:

diff --git a/test/e2e.js b/test/e2e.js
@@ -185,6 +185,7 @@ describe('plotly database connector', function Spec() {
         before(openApp);
 
         describe('upon starting', () => {
+
             it('should have the correct app title Name and Version',
             async () => {
                 const title = await this.driver.getTitle();
@@ -358,7 +359,7 @@ describe('plotly database connector', function Spec() {
 
             it('should show a log with a new logged item',
             async () => {
-                const expectedClass = 'test-1-entries';
+                const expectedClass = 'test-4-entries';
                 const logs = await this.getLogs();
 
                 const testClass = await this.getClassOf(logs);
@@ -386,7 +387,7 @@ describe('plotly database connector', function Spec() {
 
             it('should show a log with a new logged item',
             async () => {
-                const expectedClass = 'test-2-entries';
+                const expectedClass = 'test-20-entries';
                 const logs = await this.getLogs();
 
                 const testClass = await this.getClassOf(logs);
@@ -437,7 +438,7 @@ describe('plotly database connector', function Spec() {
 
             it('should show a log with a new logged item',
             async () => {
-                const expectedClass = 'test-3-entries';
+                const expectedClass = 'test-22-entries';
                 const logs = await this.getLogs();
 
                 const testClass = await this.getClassOf(logs);
@@ -471,7 +472,7 @@ describe('plotly database connector', function Spec() {
             const btn = await this.getConnectBtn();
 
             await this.waitFor(expectedClass, btn);
-            
+
             const testClass = await this.getClassOf(btn);
             expect(testClass).to.contain(expectedClass);
         });
@@ -511,7 +512,7 @@ describe('plotly database connector', function Spec() {
 
         it('should show a log with a new logged item',
         async () => {
-            const expectedClass = 'test-1-entries';
+            const expectedClass = 'test-5-entries';
             const logs = await this.getLogs();
 
             const testClass = await this.getClassOf(logs);