Merge pull request #50 from phantom5099/fork-pr-394-1776826146

phantom5099 · web-flow · commit 1b78eebb786f · 2026-04-22T11:47:26.000+08:00
fix: resolve workspace_test merge conflict
diff --git a/internal/security/workspace_test.go b/internal/security/workspace_test.go
@@ -618,9 +618,8 @@ func TestAbsoluteWorkspaceTarget(t *testing.T) {
 			if err != nil {
 				t.Fatalf("filepath.Abs(%q): %v", tt.want, err)
 			}
-			wantCanonical := cleanedPathKey(wantAbs)
-			if got != wantCanonical {
-				t.Fatalf("absoluteWorkspaceTarget() = %q, want %q", got, wantCanonical)
+			if !samePathKey(got, wantAbs) {
+				t.Fatalf("absoluteWorkspaceTarget() = %q, want %q", got, filepath.Clean(wantAbs))
 			}
 		})
 	}

Original file line number	Diff line number	Diff line change
`@@ -618,9 +618,8 @@ func TestAbsoluteWorkspaceTarget(t *testing.T) {`
`618`	`618`	`if err != nil {`
`619`	`619`	`t.Fatalf("filepath.Abs(%q): %v", tt.want, err)`
`620`	`620`	`}`
`621`		`- wantCanonical := cleanedPathKey(wantAbs)`
`622`		`- if got != wantCanonical {`
`623`		`- t.Fatalf("absoluteWorkspaceTarget() = %q, want %q", got, wantCanonical)`
	`621`	`+ if !samePathKey(got, wantAbs) {`
	`622`	`+ t.Fatalf("absoluteWorkspaceTarget() = %q, want %q", got, filepath.Clean(wantAbs))`
`624`	`623`	`}`
`625`	`624`	`})`
`626`	`625`	`}`