This test inits a temp repo and commits via commitBeadsConfig, which uses the ambient git configuration. It read the developer's real ~/.gitconfig (and the shared global config), so under the full `make test` run it could flake: `commitBeadsConfig` failed with `exit status 128` and the follow-up assertion reported `your current branch 'master' does not have any commits yet`, consistent with the global init.defaultBranch/config being clobbered or transiently rewritten by a concurrent test. Make the test hermetic, matching the pattern already used in init_hooks_test.go: pin HOME, XDG_CONFIG_HOME, and GIT_CONFIG_GLOBAL to a throwaway home, set GIT_CONFIG_NOSYSTEM=1, and create the branch explicitly with `git init --initial-branch=main` so the result never depends on the ambient init.defaultBranch. Verified: the test passes normally and, critically, still passes when run under a deliberately hostile global git config (init.defaultBranch=master, a failing global pre-commit hook, and no global identity) — confirming it no longer depends on ambient/shared git configuration. Agent-Signature: claude-opus-4-8-high on behalf of maphew
133 lines
4.8 KiB
Go
133 lines
4.8 KiB
Go
package main
|
|
|
|
import (
|
|
"os"
|
|
"os/exec"
|
|
"path/filepath"
|
|
"strings"
|
|
"testing"
|
|
|
|
internalbeads "github.com/steveyegge/beads/internal/beads"
|
|
internalgit "github.com/steveyegge/beads/internal/git"
|
|
)
|
|
|
|
func TestNormalizeRemoteURL(t *testing.T) {
|
|
tests := []struct {
|
|
input string
|
|
want string
|
|
}{
|
|
// Dolt-native schemes — returned as-is
|
|
{"dolthub://myorg/beads", "dolthub://myorg/beads"},
|
|
{"file:///tmp/doltdb", "file:///tmp/doltdb"},
|
|
{"aws://[dolt-table:us-east-1]/mydb", "aws://[dolt-table:us-east-1]/mydb"},
|
|
{"gs://my-bucket/mydb", "gs://my-bucket/mydb"},
|
|
{"git+https://github.com/org/repo.git", "git+https://github.com/org/repo.git"},
|
|
{"git+ssh://git@github.com/org/repo.git", "git+ssh://git@github.com/org/repo.git"},
|
|
{"git+http://example.com/repo.git", "git+http://example.com/repo.git"},
|
|
|
|
// Git URLs — converted to dolt remote format
|
|
{"https://github.com/org/repo.git", "git+https://github.com/org/repo.git"},
|
|
{"http://github.com/org/repo.git", "git+http://github.com/org/repo.git"},
|
|
{"ssh://git@github.com/org/repo.git", "git+ssh://git@github.com/org/repo.git"},
|
|
{"git@github.com:org/repo.git", "git+ssh://git@github.com/org/repo.git"},
|
|
{"C:/Users/alice/repos/beads.git", "git+C:/Users/alice/repos/beads.git"},
|
|
{`D:\repos\beads.git`, `git+D:\repos\beads.git`},
|
|
|
|
// Dolt remotesapi URLs — also converted (callers that need
|
|
// pass-through for user-provided URLs should skip normalization)
|
|
{"http://myserver:7007/mydb", "git+http://myserver:7007/mydb"},
|
|
{"https://doltremoteapi.example.com/mydb", "git+https://doltremoteapi.example.com/mydb"},
|
|
}
|
|
for _, tt := range tests {
|
|
t.Run(tt.input, func(t *testing.T) {
|
|
got := normalizeRemoteURL(tt.input)
|
|
if got != tt.want {
|
|
t.Errorf("normalizeRemoteURL(%q) = %q, want %q", tt.input, got, tt.want)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestCommitBeadsConfigSkipsGitHooks(t *testing.T) {
|
|
repo := t.TempDir()
|
|
|
|
// Pin bd's repo resolution to this temp repo. commitBeadsConfig resolves the
|
|
// target repo via GetRepoContext -> FindBeadsDir, which walks UP the
|
|
// directory tree. When the test runs from a checkout nested inside another
|
|
// beads repo (e.g. a verification worktree under the coordination repo),
|
|
// FindBeadsDir escapes the temp repo and resolves to the OUTER repo's
|
|
// .beads; commitBeadsConfig then commits against the wrong repository and
|
|
// fails (observed as `git commit` exit 128 and "branch has no commits yet").
|
|
// os.Chdir below is not enough because resolution is not purely CWD-based.
|
|
// BEADS_DIR pins it deterministically regardless of where the test runs.
|
|
t.Setenv("BEADS_DIR", filepath.Join(repo, ".beads"))
|
|
|
|
// Isolate git config and pin the initial branch so the commit never depends
|
|
// on the developer's ~/.gitconfig or the ambient init.defaultBranch.
|
|
gitHome := t.TempDir()
|
|
t.Setenv("HOME", gitHome)
|
|
t.Setenv("GIT_CONFIG_GLOBAL", filepath.Join(gitHome, ".gitconfig"))
|
|
t.Setenv("GIT_CONFIG_NOSYSTEM", "1")
|
|
|
|
runGitForCommitConfigTest(t, repo, "init", "--initial-branch=main")
|
|
runGitForCommitConfigTest(t, repo, "config", "user.email", "test@example.com")
|
|
runGitForCommitConfigTest(t, repo, "config", "user.name", "Test User")
|
|
|
|
beadsDir := filepath.Join(repo, ".beads")
|
|
if err := os.MkdirAll(beadsDir, 0o755); err != nil {
|
|
t.Fatalf("mkdir .beads: %v", err)
|
|
}
|
|
configPath := filepath.Join(beadsDir, "config.yaml")
|
|
if err := os.WriteFile(configPath, []byte("sync:\n remote: git+https://example.com/repo.git\n"), 0o644); err != nil {
|
|
t.Fatalf("write config: %v", err)
|
|
}
|
|
|
|
hooksDir := filepath.Join(repo, ".git", "hooks")
|
|
hookMarker := filepath.Join(repo, "hook-ran")
|
|
hook := "#!/bin/sh\n" +
|
|
"echo hook-ran > " + shellQuoteForTest(hookMarker) + "\n" +
|
|
"exit 42\n"
|
|
if err := os.WriteFile(filepath.Join(hooksDir, "pre-commit"), []byte(hook), 0o755); err != nil {
|
|
t.Fatalf("write pre-commit hook: %v", err)
|
|
}
|
|
|
|
oldWD, err := os.Getwd()
|
|
if err != nil {
|
|
t.Fatalf("getwd: %v", err)
|
|
}
|
|
if err := os.Chdir(repo); err != nil {
|
|
t.Fatalf("chdir: %v", err)
|
|
}
|
|
internalbeads.ResetCaches()
|
|
internalgit.ResetCaches()
|
|
t.Cleanup(func() {
|
|
_ = os.Chdir(oldWD)
|
|
internalbeads.ResetCaches()
|
|
internalgit.ResetCaches()
|
|
})
|
|
|
|
commitBeadsConfig("bd: update sync.remote")
|
|
|
|
if _, err := os.Stat(hookMarker); !os.IsNotExist(err) {
|
|
t.Fatalf("pre-commit hook ran during internal config commit")
|
|
}
|
|
out := runGitForCommitConfigTest(t, repo, "log", "-1", "--format=%s")
|
|
if got := strings.TrimSpace(out); got != "bd: update sync.remote" {
|
|
t.Fatalf("commit subject = %q, want %q", got, "bd: update sync.remote")
|
|
}
|
|
}
|
|
|
|
func runGitForCommitConfigTest(t *testing.T, dir string, args ...string) string {
|
|
t.Helper()
|
|
cmd := exec.Command("git", args...)
|
|
cmd.Dir = dir
|
|
out, err := cmd.CombinedOutput()
|
|
if err != nil {
|
|
t.Fatalf("git %s failed: %v\n%s", strings.Join(args, " "), err, out)
|
|
}
|
|
return string(out)
|
|
}
|
|
|
|
func shellQuoteForTest(s string) string {
|
|
return "'" + strings.ReplaceAll(s, "'", "'\\''") + "'"
|
|
}
|