test: make config path tests hermetic

Author: danielgtaylor

internal/cli/setup_test.go

@@ -428,15 +428,17 @@ func TestSetupUnsupportedShell(t *testing.T) {
 
 func TestSetupFishSupported(t *testing.T) {
 	home := t.TempDir()
+	configHome := filepath.Join(home, ".config")
 	t.Setenv("HOME", home)
+	t.Setenv("XDG_CONFIG_HOME", configHome)
 
 	c, _, _ := newTestCLI(t)
 	c.Hooks().ConfigPath = t.TempDir() + "/restish.json"
 	err := c.Run([]string{"restish", "shell", "setup", "fish", "--yes"})
 	if err != nil {
 		t.Fatalf("expected fish setup to succeed, got: %v", err)
 	}
-	rcPath := filepath.Join(home, ".config", "fish", "config.fish")
+	rcPath := filepath.Join(configHome, "fish", "config.fish")
 	if _, statErr := os.Stat(rcPath); statErr != nil {
 		t.Fatalf("expected fish config to be written: %v", statErr)
 	}

internal/config/config_test.go

@@ -40,6 +40,8 @@ func setLegacyConfigEnv(t *testing.T, home string) {
 	if runtime.GOOS == "windows" {
 		t.Setenv("USERPROFILE", home)
 		t.Setenv("APPDATA", filepath.Join(home, "AppData", "Roaming"))
+	} else {
+		t.Setenv("XDG_CONFIG_HOME", filepath.Join(home, ".config"))
 	}
 }
 

internal/config/migrate.go

@@ -87,19 +87,21 @@ func legacyConfigDirs() []string {
 	seen := map[string]bool{}
 	var dirs []string
 
-	if userDir, err := os.UserConfigDir(); err == nil && userDir != "" {
-		dir := filepath.Join(userDir, "restish")
-		if !seen[dir] {
-			seen[dir] = true
-			dirs = append(dirs, dir)
+	add := func(dir string) {
+		if dir == "" || seen[dir] {
+			return
 		}
+		seen[dir] = true
+		dirs = append(dirs, dir)
 	}
-	if home, err := os.UserHomeDir(); err == nil && home != "" {
-		dir := filepath.Join(home, ".config", "restish")
-		if !seen[dir] {
-			seen[dir] = true
-			dirs = append(dirs, dir)
-		}
+
+	if userDir, err := userConfigDirFunc(); err == nil && userDir != "" {
+		dir := filepath.Join(userDir, "restish")
+		add(dir)
+	}
+	if home, err := userHomeDirFunc(); err == nil && home != "" {
+		add(filepath.Join(home, "Library", "Application Support", "restish"))
+		add(filepath.Join(home, ".config", "restish"))
 	}
 	return dirs
 }