Windows. Please.

architect · Dec 6, 2023 · 75f1053 · 75f1053
1 parent 50c4412
commit 75f1053
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 22 deletions.
diff --git a/test/integration/preferences-test.js b/test/integration/preferences-test.js
@@ -1,14 +1,17 @@
 let { join } = require('path')
-let { homedir } = require('os')
 let test = require('tape')
-let sut = join(process.cwd(), 'src', 'index')
-let inv = require(sut)
 let mockTmp = require('mock-tmp')
+let cwd = process.cwd()
+let testLibPath = join(cwd, 'test', 'lib')
+let { getHomedir } = require(testLibPath)
+let sut = join(cwd, 'src', 'index')
+let inv = require(sut)
 
-let mock = join(process.cwd(), 'test', 'mock')
+let _homedir = getHomedir()
+let mock = join(cwd, 'test', 'mock')
 let arc = '@app\nappname\n@events\nan-event' // Not using @http so we can skip ASAP filesystem checks
 let reset = () => mockTmp.reset()
-let _testing = true, cwd
+let _testing = true
 
 /**
  * Duplicates some unit tests as part of the larger whole integration test
@@ -56,8 +59,8 @@ testing
   env_var_1 foo
   env_var_2 bar
 `
-  let path = join(homedir(), '.prefs.arc')
-  cwd = mockTmp({
+  let path = join(_homedir, '.prefs.arc')
+  let cwd = mockTmp({
     'app.arc': arc,
     [path]: prefsText
   })
@@ -198,8 +201,8 @@ staging
       production: null,
     }
   }
-  let path = join(homedir(), '.prefs.arc')
-  cwd = mockTmp({
+  let path = join(_homedir, '.prefs.arc')
+  let cwd = mockTmp({
     'app.arc': arc,
     [path]: globalPrefsText,
     'preferences.arc': localPrefsText
@@ -239,7 +242,7 @@ test('Preferences validation errors', async t => {
 @env
 foo
 `
-  cwd = mockTmp({
+  let cwd = mockTmp({
     'app.arc': arc,
     'prefs.arc': prefs,
   })

diff --git a/test/lib/index.js b/test/lib/index.js
@@ -1,5 +1,12 @@
+let { homedir } = require('os')
 let { is } = require('../../src/lib')
 
+function getHomedir () {
+  let _homedir = homedir()
+  if (process.platform === 'win32') _homedir = _homedir.replace(/^[A-Z]:\\/, '')
+  return _homedir
+}
+
 function setterPluginSetup (setter, fns) {
   let methods = is.array(fns) ? fns : [ fns ]
   methods = methods.map(m => {
@@ -11,5 +18,6 @@ function setterPluginSetup (setter, fns) {
 }
 
 module.exports = {
-  setterPluginSetup
+  getHomedir,
+  setterPluginSetup,
 }
diff --git a/test/unit/src/config/project/index-test.js b/test/unit/src/config/project/index-test.js
@@ -1,8 +1,9 @@
 let { join } = require('path')
-let { homedir } = require('os')
 let test = require('tape')
 let mockTmp = require('mock-tmp')
 let cwd = process.cwd()
+let testLibPath = join(cwd, 'test', 'lib')
+let { getHomedir } = require(testLibPath)
 let inventoryDefaultsPath = join(process.cwd(), 'src', 'defaults')
 let inventoryDefaults = require(inventoryDefaultsPath)
 let defaultFunctionConfigPath = join(process.cwd(), 'src', 'defaults', 'function-config')
@@ -11,14 +12,7 @@ let sut = join(cwd, 'src', 'config', 'project')
 let getProjectConfig = require(sut)
 
 let localPrefsFile = 'prefs.arc'
-let _homedir = homedir()
-// TODO ↓ remove me! ↓
-console.log(`_homedir:`, _homedir)
-// TODO ↓ remove me! ↓
-console.log(`cwd:`, cwd)
-if (process.platform === 'win32') _homedir = _homedir.replace(/^[A-Z]:\\/, '')
-// TODO ↓ remove me! ↓
-console.log(`_homedir:`, _homedir)
+let _homedir = getHomedir()
 let globalPrefsFile = join(_homedir, 'prefs.arc')
 let _testing = true
 

diff --git a/test/unit/src/config/project/prefs/index-test.js b/test/unit/src/config/project/prefs/index-test.js
@@ -1,14 +1,16 @@
 let { join } = require('path')
-let { homedir } = require('os')
 let test = require('tape')
 let mockTmp = require('mock-tmp')
 let cwd = process.cwd()
+let testLibPath = join(cwd, 'test', 'lib')
+let { getHomedir } = require(testLibPath)
 let inventoryDefaultsPath = join(cwd, 'src', 'defaults')
 let inventoryDefaults = require(inventoryDefaultsPath)
 let sut = join(cwd, 'src', 'config', 'project', 'prefs')
 let getPrefs = require(sut)
 
-let path = join(homedir(), '.prefs.arc')
+let _homedir = getHomedir()
+let path = join(_homedir, '.prefs.arc')
 let reset = () => mockTmp.restore()
 function clean (preferences) {
   // Delete the meta stuff so the actual preferences match during an equality check