fix(defaults): macOS env.APPDATA should be undefined (#27)

* fix(defaults): macOS env.APPDATA should be undefined Close #24 * fix(defaults): macOS env.APPDATA should be undefined Close #24
kentcdodds · Aug 29, 2016 · 9976b5e · 9976b5e
1 parent b7f6245
commit 9976b5e
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 6 deletions.
diff --git a/src/index.js b/src/index.js
@@ -14,7 +14,7 @@ function crossEnv(args) {
   }
 }
 
-function getCommandArgsAndEnvVars(args) {
+function getCommandArgsAndEnvVars(args) { // eslint-disable-line
   let command;
   const envVars = assign({}, process.env);
   const commandArgs = args.slice();
@@ -27,7 +27,9 @@ function getCommandArgsAndEnvVars(args) {
       command = shifted;
       break;
     }
-    envVars.APPDATA = process.env.APPDATA;
+    if (process.env.APPDATA) {
+      envVars.APPDATA = process.env.APPDATA;
+    }
   }
   return [command, commandArgs, envVars];
 }
diff --git a/src/index.test.js b/src/index.test.js
@@ -28,11 +28,19 @@ describe(`cross-env`, () => {
     }, 'FOO_ENV=production');
   });
 
+  it(`should APPDATA be undefined and not string`, () => {
+    testEnvSetting({
+      FOO_ENV: 'production',
+      APPDATA: 2
+    }, 'FOO_ENV=production');
+  });
+
   it(`should handle multiple env variables`, () => {
     testEnvSetting({
       FOO_ENV: 'production',
-      BAR_ENV: 'dev'
-    }, 'FOO_ENV=production', 'BAR_ENV=dev');
+      BAR_ENV: 'dev',
+      APPDATA: '0'
+    }, 'FOO_ENV=production', 'BAR_ENV=dev', 'APPDATA=0');
   });
 
   it(`should handle special characters`, () => {
@@ -74,11 +82,18 @@ describe(`cross-env`, () => {
   });
 
   function testEnvSetting(expected, ...envSettings) {
+    if (expected.APPDATA === 2) { // kill the APPDATA to test both is undefined
+      delete process.env.APPDATA;
+      delete expected.APPDATA;
+    } else if (!process.env.APPDATA && expected.APPDATA === '0') { // set APPDATA and test it
+      process.env.APPDATA = '0';
+    }
     const ret = crossEnv([...envSettings, 'echo', 'hello world']);
     const env = {};
-    env.APPDATA = process.env.APPDATA;
+    if (process.env.APPDATA) {
+      env.APPDATA = process.env.APPDATA;
+    }
     assign(env, expected);
-
     expect(ret, 'returns what spawn returns').to.equal(spawned);
     expect(proxied['cross-spawn'].spawn).to.have.been.calledOnce;
     expect(proxied['cross-spawn'].spawn).to.have.been.calledWith(