test(skill): merge isolated test into table

Signed-off-by: Babak K. Shandiz <babakks@github.com>

Author: babakks

internal/skills/registry/registry_test.go

@@ -42,6 +42,7 @@ func TestInstallDir(t *testing.T) {
 
 	tests := []struct {
 		name    string
+		setup   func(*testing.T)
 		hostID  string
 		scope   Scope
 		gitRoot string
@@ -81,6 +82,17 @@ func TestInstallDir(t *testing.T) {
 			homeDir: "/home/monalisa",
 			wantDir: filepath.Join("/home/monalisa", ".claude", "skills"),
 		},
+		{
+			name: "claude code user scope",
+			setup: func(t *testing.T) {
+				t.Setenv("CLAUDE_CONFIG_DIR", filepath.Join("/home", "monalisa", ".config", "claude"))
+			},
+			hostID:  "claude-code",
+			scope:   ScopeUser,
+			gitRoot: "/tmp/monalisa-repo",
+			homeDir: "/home/monalisa",
+			wantDir: filepath.Join("/home", "monalisa", ".config", "claude", "skills"),
+		},
 		{
 			name:    "cursor project scope",
 			hostID:  "cursor",
@@ -140,6 +152,10 @@ func TestInstallDir(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
+			if tt.setup != nil {
+				tt.setup(t)
+			}
+
 			host, err := FindByID(tt.hostID)
 			require.NoError(t, err)
 
@@ -154,17 +170,6 @@ func TestInstallDir(t *testing.T) {
 	}
 }
 
-func TestInstallDir_ClaudeConfigDir(t *testing.T) {
-	t.Setenv(claudeConfigDirEnv, filepath.Join("/home", "monalisa", ".config", "claude"))
-
-	host, err := FindByID("claude-code")
-	require.NoError(t, err)
-
-	dir, err := host.InstallDir(ScopeUser, "/tmp/monalisa-repo", "/home/monalisa")
-	require.NoError(t, err)
-	assert.Equal(t, filepath.Join("/home", "monalisa", ".config", "claude", "skills"), dir)
-}
-
 func TestRepoNameFromRemote(t *testing.T) {
 	tests := []struct {
 		remote string

pkg/cmd/skills/install/install_test.go

@@ -292,6 +292,7 @@ func TestInstallRun(t *testing.T) {
 		wantErr    string
 		wantStdout string
 		wantStderr string
+		assert     func(t *testing.T)
 	}{
 		{
 			name:  "non-interactive without repo errors",
@@ -1480,6 +1481,37 @@ func TestInstallRun(t *testing.T) {
 			wantStdout: "Installed hidden-skill",
 			wantStderr: "Skills in hidden directories",
 		},
+		{
+			name: "respect claude code config dir env var for user scope",
+			setup: func(t *testing.T) {
+				t.Setenv("CLAUDE_CONFIG_DIR", t.TempDir())
+			},
+			stubs: func(reg *httpmock.Registry) {
+				stubResolveVersion(reg, "monalisa", "skills-repo", "v1.0.0", "abc123")
+				stubDiscoverTree(reg, "monalisa", "skills-repo", "abc123",
+					singleSkillTreeJSON("git-commit", "treeSHA", "blobSHA"))
+				stubInstallFiles(reg, "monalisa", "skills-repo", "treeSHA", "blobSHA", gitCommitContent)
+			},
+			opts: func(ios *iostreams.IOStreams, reg *httpmock.Registry) *InstallOptions {
+				t.Helper()
+				return &InstallOptions{
+					IO:           ios,
+					HttpClient:   func() (*http.Client, error) { return &http.Client{Transport: reg}, nil },
+					GitClient:    &git.Client{RepoDir: t.TempDir()},
+					SkillSource:  "monalisa/skills-repo",
+					SkillName:    "git-commit",
+					Agent:        "claude-code",
+					Scope:        "user",
+					ScopeChanged: true,
+					Telemetry:    &telemetry.NoOpService{},
+				}
+			},
+			assert: func(t *testing.T) {
+				assert.FileExists(t, filepath.Join(os.Getenv("CLAUDE_CONFIG_DIR"), "skills", "git-commit", "SKILL.md"))
+				assert.NoFileExists(t, filepath.Join(os.Getenv("HOME"), ".claude", "skills", "git-commit", "SKILL.md"))
+			},
+			wantStdout: "Installed git-commit",
+		},
 	}
 
 	for _, tt := range tests {
@@ -1525,6 +1557,9 @@ func TestInstallRun(t *testing.T) {
 			if tt.verify != nil {
 				tt.verify(t)
 			}
+			if tt.assert != nil {
+				tt.assert(t)
+			}
 		})
 	}
 }
@@ -1537,40 +1572,6 @@ func TestInstallProgress(t *testing.T) {
 	assert.NotNil(t, installProgress(ios, 2))
 }
 
-func TestInstallRun_ClaudeCodeUserScopeUsesConfigDir(t *testing.T) {
-	homeDir := t.TempDir()
-	claudeConfigDir := t.TempDir()
-	t.Setenv("HOME", homeDir)
-	t.Setenv("USERPROFILE", homeDir)
-	t.Setenv("CLAUDE_CONFIG_DIR", claudeConfigDir)
-
-	reg := &httpmock.Registry{}
-	defer reg.Verify(t)
-
-	stubResolveVersion(reg, "monalisa", "skills-repo", "v1.0.0", "abc123")
-	stubDiscoverTree(reg, "monalisa", "skills-repo", "abc123",
-		singleSkillTreeJSON("git-commit", "treeSHA", "blobSHA"))
-	stubInstallFiles(reg, "monalisa", "skills-repo", "treeSHA", "blobSHA", gitCommitContent)
-
-	ios, _, stdout, _ := iostreams.Test()
-
-	err := installRun(&InstallOptions{
-		IO:           ios,
-		HttpClient:   func() (*http.Client, error) { return &http.Client{Transport: reg}, nil },
-		GitClient:    &git.Client{RepoDir: t.TempDir()},
-		SkillSource:  "monalisa/skills-repo",
-		SkillName:    "git-commit",
-		Agent:        "claude-code",
-		Scope:        "user",
-		ScopeChanged: true,
-		Telemetry:    &telemetry.NoOpService{},
-	})
-	require.NoError(t, err)
-	assert.Contains(t, stdout.String(), "Installed git-commit")
-	assert.FileExists(t, filepath.Join(claudeConfigDir, "skills", "git-commit", "SKILL.md"))
-	assert.NoFileExists(t, filepath.Join(homeDir, ".claude", "skills", "git-commit", "SKILL.md"))
-}
-
 func TestInstallRun_DeduplicatesSharedProjectDirAcrossHosts(t *testing.T) {
 	homeDir := t.TempDir()
 	t.Setenv("HOME", homeDir)