Fix config dir test

Author: code-asher

src/auth.test.ts

@@ -16,24 +16,33 @@ suite("Authenticate", () => {
 
   teardown(() => utils.resetEnv())
 
+  const assertDir = (actual: string, expected: string) => {
+    assert.match(actual, new RegExp(expected.replace(/\\/g, "\\$&") + "$"))
+  }
+
   const assertDirs = (dir: string) => {
-    assert.match(auth.getConfigDir("linux"), new RegExp(path.join(dir, ".config$")))
-    assert.match(auth.getConfigDir("freebsd"), new RegExp(path.join(dir, ".config$")))
-    assert.match(auth.getConfigDir("win32"), new RegExp(path.join(dir, "AppData/Roaming$")))
-    assert.match(auth.getConfigDir("darwin"), new RegExp(path.join(dir, "Library/Application Support$")))
+    assertDir(auth.getConfigDir("linux"), path.join(dir, ".config"))
+    assertDir(auth.getConfigDir("freebsd"), path.join(dir, ".config"))
+    assertDir(auth.getConfigDir("win32"), path.join(dir, "AppData/Roaming"))
+    assertDir(auth.getConfigDir("darwin"), path.join(dir, "Library/Application Support"))
   }
 
   test("getConfigDir", async () => {
     // Make sure local config mocks work.
     const tmpDir = await utils.tmpdir(tmpPath)
     utils.setEnv("HOME", tmpDir)
+    utils.setEnv("USERPROFILE", tmpDir)
+    utils.setEnv("XDG_CONFIG_HOME", undefined)
+    utils.setEnv("APPDATA", undefined)
     assertDirs(tmpDir)
 
     // Make sure the global mock also works.  For example the Linux temp config
     // directory looks like: /tmp/coder/tests/config/tmp-Dzfqwl/home/.config
     // This runs after the local mock to make sure environment variables are
     // being restored correctly.
     utils.resetEnv()
+    utils.setEnv("XDG_CONFIG_HOME", undefined)
+    utils.setEnv("APPDATA", undefined)
     assertDirs("tests/config/.+/home")
   })
 

src/test/runTest.ts

@@ -19,7 +19,7 @@ async function main() {
     const tmpPath = "tests/config"
     await utils.clean(tmpPath)
     const temp = await utils.tmpdir(tmpPath)
-    process.env.HOME = path.join(temp, "home")
+    process.env.HOME = process.env.USERPROFILE = path.join(temp, "home")
 
     // The folder containing the Extension Manifest package.json
     // Passed to `--extensionDevelopmentPath`

src/utils.test.ts

@@ -55,6 +55,9 @@ suite("Utils", () => {
     assert.strictEqual(process.env[key], undefined)
     utils.setEnv(key, "baz")
     assert.strictEqual(process.env[key], "baz")
+    utils.setEnv(key, undefined)
+    assert.strictEqual(process.env[key], undefined)
+    utils.setEnv(key, "baz")
     utils.resetEnv()
     assert.strictEqual(process.env[key], undefined)
   })

src/utils.ts

@@ -147,12 +147,17 @@ export const resetEnv = (): void => {
 /**
  * Set an environment variable that will be reset on a call to `resetEnv`.
  */
-export const setEnv = (key: string, value: string): void => {
+export const setEnv = (key: string, value: string | undefined): void => {
   const original = process.env[key]
-  process.env[key] = value
+  // You cannot set process.env properties to undefined as they will just be set
+  // it to the literal string "undefined" so delete instead.
+  if (typeof value === "undefined") {
+    delete process.env[key]
+  } else {
+    process.env[key] = value
+  }
   envResets.push(() => {
-    // You cannot set process.env properties to undefined as they will just be
-    // set it to the literal string "undefined" so delete instead.
+    // Same deal with undefined here.
     if (typeof original === "undefined") {
       delete process.env[key]
     } else {