feat: record path handlingt to strip testDir prefix

This commit is contained in:
2026-03-18 10:22:43 +00:00
parent 9cf3ed6a5c
commit aecbefa7ba
3 changed files with 166 additions and 1 deletions
+36 -1
View File
@@ -4,6 +4,7 @@ import (
"fmt"
"os"
"path/filepath"
"strings"
)
// Record creates the requested directory path under the resolved test directory.
@@ -13,10 +14,44 @@ func Record(path string) (string, error) {
return "", fmt.Errorf("failed to resolve test directory: %v", err)
}
target := filepath.Join(testDir, path)
target, err := resolveRecordTarget(testDir, path)
if err != nil {
return "", err
}
if err := os.MkdirAll(target, 0o755); err != nil {
return "", err
}
return target, nil
}
func resolveRecordTarget(testDir, path string) (string, error) {
absTestDir, err := filepath.Abs(testDir)
if err != nil {
return "", fmt.Errorf("failed to resolve test directory path: %v", err)
}
absPath, err := filepath.Abs(path)
if err != nil {
return "", fmt.Errorf("failed to resolve record path: %v", err)
}
// path rel to testDir
relToTestDir, err := filepath.Rel(absTestDir, absPath)
if err == nil && isWithinBase(relToTestDir) {
return filepath.Join(absTestDir, relToTestDir), nil
}
// not rel to test dir and absolute path given
if filepath.IsAbs(path) {
return "", fmt.Errorf("record path %q must be inside test directory %q", path, absTestDir)
}
return filepath.Join(absTestDir, path), nil
}
// is the rel path going "outside"
func isWithinBase(rel string) bool {
return rel == "." || (rel != ".." && !strings.HasPrefix(rel, ".."+string(os.PathSeparator)))
}
+75
View File
@@ -0,0 +1,75 @@
package miro
import (
"os"
"path/filepath"
"testing"
)
func TestRecordCreatesRelativePath(t *testing.T) {
root := t.TempDir()
testDir := filepath.Join(root, "e2e")
mustMkdirAll(t, testDir)
got := withWorkingDir(t, root, func() string {
path, err := Record(filepath.Join("a", "b", "c") + string(os.PathSeparator))
if err != nil {
t.Fatalf("Record() error = %v", err)
}
return path
})
want := filepath.Join(testDir, "a", "b", "c")
if got != want {
t.Fatalf("Record() = %q, want %q", got, want)
}
info, err := os.Stat(want)
if err != nil {
t.Fatalf("Stat() error = %v", err)
}
if !info.IsDir() {
t.Fatalf("created path %q is not a directory", want)
}
}
func TestRecordStripsExplicitTestDirPrefix(t *testing.T) {
root := t.TempDir()
testDir := filepath.Join(root, "e2e")
mustMkdirAll(t, testDir)
got := withWorkingDir(t, root, func() string {
path, err := Record(filepath.Join("e2e", "a", "b", "c"))
if err != nil {
t.Fatalf("Record() error = %v", err)
}
return path
})
want := filepath.Join(testDir, "a", "b", "c")
if got != want {
t.Fatalf("Record() = %q, want %q", got, want)
}
if _, err := os.Stat(want); err != nil {
t.Fatalf("Stat() error = %v", err)
}
}
func TestRecordRejectsAbsolutePathOutsideTestDir(t *testing.T) {
root := t.TempDir()
mustMkdirAll(t, filepath.Join(root, "e2e"))
outside := filepath.Join(root, "outside", "a", "b", "c")
err := withWorkingDir(t, root, func() error {
_, err := Record(outside)
return err
})
if err == nil {
t.Fatal("Record() error = nil, want error")
}
if _, statErr := os.Stat(outside); !os.IsNotExist(statErr) {
t.Fatalf("Stat(%q) error = %v, want not exists", outside, statErr)
}
}