Prevent config tests from modifying real config (#1374)

Author: eleftherias

pkg/client/config_test.go

@@ -9,6 +9,7 @@ import (
 	"path/filepath"
 	"testing"
 
+	"github.com/adrg/xdg"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
@@ -83,6 +84,7 @@ func MockConfig(t *testing.T, cfg *config.Config) func() {
 	// Save original XDG_CONFIG_HOME
 	originalXDGConfigHome := os.Getenv("XDG_CONFIG_HOME")
 	t.Setenv("XDG_CONFIG_HOME", tempDir)
+	xdg.Reload()
 
 	// Create the config directory structure
 	configDir := filepath.Join(tempDir, "toolhive")
@@ -97,6 +99,7 @@ func MockConfig(t *testing.T, cfg *config.Config) func() {
 
 	return func() {
 		t.Setenv("XDG_CONFIG_HOME", originalXDGConfigHome)
+		xdg.Reload()
 	}
 }
 
@@ -226,31 +229,32 @@ func TestSuccessfulClientConfigOperations(t *testing.T) {
 	// Create test config files
 	createTestConfigFiles(t, tempHome)
 
-	t.Run("FindAllConfiguredClients", func(t *testing.T) { //nolint:paralleltest // Uses environment variables
-		testConfig := &config.Config{
-			Secrets: config.Secrets{
-				ProviderType: "encrypted",
-			},
-			Clients: config.Clients{
-				RegisteredClients: []string{
-					string(VSCode),
-					string(VSCodeInsider),
-					string(Cursor),
-					string(RooCode),
-					string(ClaudeCode),
-					string(Cline),
-					string(AmpCli),
-					string(AmpVSCode),
-					string(AmpCursor),
-					string(AmpVSCodeInsider),
-					string(AmpWindsurf),
-				},
+	// Set up config for all sub-tests
+	testConfig := &config.Config{
+		Secrets: config.Secrets{
+			ProviderType: "encrypted",
+		},
+		Clients: config.Clients{
+			RegisteredClients: []string{
+				string(VSCode),
+				string(VSCodeInsider),
+				string(Cursor),
+				string(RooCode),
+				string(ClaudeCode),
+				string(Cline),
+				string(AmpCli),
+				string(AmpVSCode),
+				string(AmpCursor),
+				string(AmpVSCodeInsider),
+				string(AmpWindsurf),
 			},
-		}
+		},
+	}
 
-		cleanup := MockConfig(t, testConfig)
-		defer cleanup()
+	cleanup := MockConfig(t, testConfig)
+	defer cleanup()
 
+	t.Run("FindAllConfiguredClients", func(t *testing.T) { //nolint:paralleltest // Uses environment variables
 		configs, err := FindRegisteredClientConfigs()
 		require.NoError(t, err)
 		assert.Len(t, configs, len(supportedClientIntegrations), "Should find all mock client configs")