fix(git): git doesnt show branch suggesstion properly
This commit is contained in:
verse91
+227
-86
@@ -12,42 +12,101 @@ import (
|
||||
_ "github.com/versenilvis/iris/commands/dev"
|
||||
)
|
||||
|
||||
func TestGitSuggestions(t *testing.T) {
|
||||
// Setup a real git repo in temp dir for testing branch generators
|
||||
tmp := t.TempDir()
|
||||
oldWd, _ := os.Getwd()
|
||||
_ = os.Chdir(tmp)
|
||||
defer func() { _ = os.Chdir(oldWd) }()
|
||||
// setupGitRepo creates a real git repo in a temp dir with:
|
||||
// - local branches: main (HEAD), dev, feature/login, stable
|
||||
// - remote branches: origin/main, origin/dev (written directly to .git/refs)
|
||||
// - a tag: v1.0
|
||||
// - a stash entry
|
||||
func setupGitRepo(t *testing.T) (tmp string, cleanup func()) {
|
||||
t.Helper()
|
||||
|
||||
tmp = t.TempDir()
|
||||
ctx := context.Background()
|
||||
// Initialize git repo
|
||||
_ = exec.CommandContext(ctx, "git", "init").Run()
|
||||
|
||||
_ = exec.CommandContext(ctx, "git", "config", "user.email", "iris-test@example.com").Run() // this is for ci/cd
|
||||
_ = exec.CommandContext(ctx, "git", "config", "user.name", "Iris Test").Run() // this is for ci/cd
|
||||
run := func(args ...string) {
|
||||
t.Helper()
|
||||
out, err := exec.CommandContext(ctx, args[0], args[1:]...).CombinedOutput()
|
||||
if err != nil {
|
||||
t.Logf("git cmd %v: %s", args, out)
|
||||
}
|
||||
}
|
||||
|
||||
_ = os.WriteFile(filepath.Join(tmp, "file.go"), []byte("package main"), 0644)
|
||||
_ = exec.CommandContext(ctx, "git", "add", ".").Run()
|
||||
_ = exec.CommandContext(ctx, "git", "commit", "-m", "initial").Run()
|
||||
run("git", "-C", tmp, "init", "--initial-branch=main")
|
||||
|
||||
// Create branches
|
||||
_ = exec.CommandContext(ctx, "git", "branch", "feature/login").Run()
|
||||
_ = exec.CommandContext(ctx, "git", "branch", "dev").Run()
|
||||
_ = exec.CommandContext(ctx, "git", "tag", "v1.0").Run()
|
||||
// use fallback for older git that doesn't support --initial-branch
|
||||
if _, err := os.Stat(filepath.Join(tmp, ".git", "refs", "heads", "main")); err != nil {
|
||||
run("git", "-C", tmp, "init")
|
||||
}
|
||||
|
||||
// Setup stash
|
||||
_ = os.WriteFile(filepath.Join(tmp, "dirty.go"), []byte("dirty"), 0644)
|
||||
_ = exec.CommandContext(ctx, "git", "add", ".").Run()
|
||||
_ = exec.CommandContext(ctx, "git", "stash").Run()
|
||||
run("git", "-C", tmp, "config", "user.email", "iris-test@example.com") // this is for ci/cd
|
||||
run("git", "-C", tmp, "config", "user.name", "Iris Test") // this is for ci/cd
|
||||
|
||||
// initial commit so branches can be created
|
||||
if err := os.WriteFile(filepath.Join(tmp, "file.go"), []byte("package main"), 0644); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
run("git", "-C", tmp, "add", ".")
|
||||
run("git", "-C", tmp, "commit", "-m", "initial")
|
||||
|
||||
// local branches (incl. slash branch to test tokenization)
|
||||
run("git", "-C", tmp, "branch", "dev")
|
||||
run("git", "-C", tmp, "branch", "stable")
|
||||
run("git", "-C", tmp, "branch", "feature/login")
|
||||
|
||||
// tag
|
||||
run("git", "-C", tmp, "tag", "v1.0")
|
||||
|
||||
// add a real remote in config
|
||||
run("git", "-C", tmp, "remote", "add", "origin", "https://github.com/versenilvis/iris.git")
|
||||
|
||||
// write fake remote refs directly (no need for actual remote server)
|
||||
for _, ref := range []string{"main", "dev"} {
|
||||
dir := filepath.Join(tmp, ".git", "refs", "remotes", "origin")
|
||||
if err := os.MkdirAll(dir, 0755); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
// point them to the same commit as HEAD for simplicity
|
||||
headBytes, err := os.ReadFile(filepath.Join(tmp, ".git", "refs", "heads", "main"))
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := os.WriteFile(filepath.Join(dir, ref), headBytes, 0644); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
|
||||
// stash entry
|
||||
if err := os.WriteFile(filepath.Join(tmp, "dirty.go"), []byte("dirty"), 0644); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
run("git", "-C", tmp, "add", ".")
|
||||
run("git", "-C", tmp, "stash")
|
||||
|
||||
// chdir into repo so generators can run git commands
|
||||
oldWd, err := os.Getwd()
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := os.Chdir(tmp); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
cleanup = func() { _ = os.Chdir(oldWd) }
|
||||
return tmp, cleanup
|
||||
}
|
||||
|
||||
func TestGitSuggestions(t *testing.T) {
|
||||
tmp, cleanup := setupGitRepo(t)
|
||||
defer cleanup()
|
||||
|
||||
t.Run("git top-level", func(t *testing.T) {
|
||||
res := core.Lookup("git ")
|
||||
if len(res) < 10 {
|
||||
t.Errorf("Expected many git subcommands, got %d", len(res))
|
||||
t.Errorf("expected many git subcommands, got %d", len(res))
|
||||
}
|
||||
})
|
||||
|
||||
t.Run("git tag -d show tags", func(t *testing.T) {
|
||||
t.Run("tag -d shows tags", func(t *testing.T) {
|
||||
res := core.Lookup("git tag -d ")
|
||||
found := false
|
||||
for _, r := range res {
|
||||
@@ -56,12 +115,11 @@ func TestGitSuggestions(t *testing.T) {
|
||||
}
|
||||
}
|
||||
if !found {
|
||||
t.Error("git tag -d should suggest existing tags")
|
||||
t.Error("git tag -d should suggest v1.0")
|
||||
}
|
||||
})
|
||||
|
||||
t.Run("git push HEAD options", func(t *testing.T) {
|
||||
// git push origin HEAD --force -> should show --force
|
||||
t.Run("push HEAD options", func(t *testing.T) {
|
||||
res := core.Lookup("git push origin HEAD --")
|
||||
found := false
|
||||
for _, r := range res {
|
||||
@@ -74,8 +132,7 @@ func TestGitSuggestions(t *testing.T) {
|
||||
}
|
||||
})
|
||||
|
||||
t.Run("git push upstream options", func(t *testing.T) {
|
||||
// git push -u origin -> show branches
|
||||
t.Run("push -u origin suggests branches", func(t *testing.T) {
|
||||
res := core.Lookup("git push -u origin ")
|
||||
found := false
|
||||
for _, r := range res {
|
||||
@@ -84,15 +141,152 @@ func TestGitSuggestions(t *testing.T) {
|
||||
}
|
||||
}
|
||||
if !found {
|
||||
t.Error("git push -u origin should suggest branches")
|
||||
t.Errorf("git push -u origin should suggest branches, got: %v", res)
|
||||
}
|
||||
})
|
||||
|
||||
t.Run("git reset options", func(t *testing.T) {
|
||||
// git reset --soft origin/main -> should be accepted (just testing lookup doesn't crash)
|
||||
_ = core.Lookup("git reset --soft origin/main ")
|
||||
t.Run("push origin suggests active branch", func(t *testing.T) {
|
||||
ctx := context.Background()
|
||||
out, err := exec.CommandContext(ctx, "git", "rev-parse", "--abbrev-ref", "HEAD").Output()
|
||||
if err != nil {
|
||||
t.Skip("can't determine HEAD branch")
|
||||
}
|
||||
activeBranch := strings.TrimSpace(string(out))
|
||||
res := core.Lookup("git push origin ")
|
||||
found := false
|
||||
for _, r := range res {
|
||||
parts := strings.Fields(r.Cmd)
|
||||
if len(parts) > 0 && parts[len(parts)-1] == activeBranch {
|
||||
found = true
|
||||
break
|
||||
}
|
||||
}
|
||||
if !found {
|
||||
t.Errorf("git push origin should suggest active branch '%s'", activeBranch)
|
||||
}
|
||||
})
|
||||
|
||||
// git reset HEAD -> show files
|
||||
t.Run("push origin no duplicate branches", func(t *testing.T) {
|
||||
res := core.Lookup("git push origin ")
|
||||
seen := make(map[string]int)
|
||||
for _, r := range res {
|
||||
parts := strings.Fields(r.Cmd)
|
||||
if len(parts) == 0 {
|
||||
continue
|
||||
}
|
||||
branch := parts[len(parts)-1]
|
||||
seen[branch]++
|
||||
if seen[branch] > 1 {
|
||||
t.Errorf("duplicate branch suggestion: %s", branch)
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
|
||||
t.Run("branch with slash is suggested correctly", func(t *testing.T) {
|
||||
res := core.Lookup("git checkout ")
|
||||
found := false
|
||||
for _, r := range res {
|
||||
if strings.Contains(r.Cmd, "feature/login") {
|
||||
found = true
|
||||
}
|
||||
}
|
||||
if !found {
|
||||
t.Error("git checkout should suggest 'feature/login'")
|
||||
}
|
||||
})
|
||||
|
||||
t.Run("remote branches suggested for push", func(t *testing.T) {
|
||||
res := core.Lookup("git push origin ")
|
||||
cmdStr := ""
|
||||
for _, r := range res {
|
||||
cmdStr += r.Cmd + " "
|
||||
}
|
||||
// should have at least dev or main from branch list
|
||||
if !strings.Contains(cmdStr, "dev") && !strings.Contains(cmdStr, "main") {
|
||||
t.Errorf("git push origin should suggest local branches, got: %s", cmdStr)
|
||||
}
|
||||
})
|
||||
|
||||
t.Run("active branch not suggested for checkout", func(t *testing.T) {
|
||||
// find actual active branch
|
||||
ctx := context.Background()
|
||||
out, err := exec.CommandContext(ctx, "git", "rev-parse", "--abbrev-ref", "HEAD").Output()
|
||||
if err != nil {
|
||||
t.Skip("can't determine HEAD branch")
|
||||
}
|
||||
activeBranch := strings.TrimSpace(string(out))
|
||||
|
||||
res := core.Lookup("git checkout ")
|
||||
for _, r := range res {
|
||||
// the suggestion should not contain the active branch as a standalone word
|
||||
parts := strings.Fields(r.Cmd)
|
||||
for _, p := range parts {
|
||||
if p == activeBranch {
|
||||
t.Errorf("git checkout should not suggest active branch '%s', got: %s", activeBranch, r.Cmd)
|
||||
}
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
t.Run("checkout -b no suggest", func(t *testing.T) {
|
||||
res := core.Lookup("git checkout -b ")
|
||||
for _, r := range res {
|
||||
if strings.Contains(r.Cmd, "dev") {
|
||||
t.Error("git checkout -b should not suggest existing branches")
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
t.Run("switch -c no suggest", func(t *testing.T) {
|
||||
res := core.Lookup("git switch -c ")
|
||||
for _, r := range res {
|
||||
if strings.Contains(r.Cmd, "dev") {
|
||||
t.Error("git switch -c should not suggest existing branches")
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
t.Run("stash variants suggest entries", func(t *testing.T) {
|
||||
for _, cmd := range []string{"apply", "drop", "pop"} {
|
||||
res := core.Lookup("git stash " + cmd + " ")
|
||||
found := false
|
||||
for _, r := range res {
|
||||
if strings.Contains(r.Cmd, "stash@{0}") {
|
||||
found = true
|
||||
}
|
||||
}
|
||||
if !found {
|
||||
t.Errorf("git stash %s should suggest stash@{0}", cmd)
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
t.Run("remote subcommands suggest remotes", func(t *testing.T) {
|
||||
for _, cmd := range []string{"remove", "rename", "set-url"} {
|
||||
res := core.Lookup("git remote " + cmd + " ")
|
||||
found := false
|
||||
for _, r := range res {
|
||||
// origin is our fake remote
|
||||
if strings.Contains(r.Cmd, "origin") {
|
||||
found = true
|
||||
}
|
||||
}
|
||||
if !found {
|
||||
t.Errorf("git remote %s should suggest origin", cmd)
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
t.Run("not a git repo no crash", func(t *testing.T) {
|
||||
emptyDir := t.TempDir()
|
||||
_ = os.Chdir(emptyDir)
|
||||
defer func() { _ = os.Chdir(tmp) }()
|
||||
_ = core.Lookup("git status ")
|
||||
})
|
||||
|
||||
t.Run("reset options", func(t *testing.T) {
|
||||
_ = core.Lookup("git reset --soft origin/main ")
|
||||
res := core.Lookup("git reset HEAD ")
|
||||
found := false
|
||||
for _, r := range res {
|
||||
@@ -104,57 +298,4 @@ func TestGitSuggestions(t *testing.T) {
|
||||
t.Error("git reset HEAD should suggest file.go")
|
||||
}
|
||||
})
|
||||
|
||||
t.Run("git checkout -b no suggest", func(t *testing.T) {
|
||||
// git checkout -b -> should NOT suggest branches
|
||||
res := core.Lookup("git checkout -b ")
|
||||
for _, r := range res {
|
||||
if strings.Contains(r.Cmd, "dev") {
|
||||
t.Error("git checkout -b should not suggest existing branches")
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
t.Run("git switch -c no suggest", func(t *testing.T) {
|
||||
res := core.Lookup("git switch -c ")
|
||||
for _, r := range res {
|
||||
if strings.Contains(r.Cmd, "dev") {
|
||||
t.Error("git switch -c should not suggest existing branches")
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
t.Run("stash entries", func(t *testing.T) {
|
||||
res := core.Lookup("git stash pop ")
|
||||
found := false
|
||||
for _, r := range res {
|
||||
if strings.Contains(r.Cmd, "stash@{0}") {
|
||||
found = true
|
||||
}
|
||||
}
|
||||
if !found {
|
||||
t.Error("git stash pop should suggest stash@{0}")
|
||||
}
|
||||
})
|
||||
|
||||
t.Run("not a git repo", func(t *testing.T) {
|
||||
emptyDir := t.TempDir()
|
||||
_ = os.Chdir(emptyDir)
|
||||
// Should not crash
|
||||
_ = core.Lookup("git status ")
|
||||
_ = os.Chdir(tmp)
|
||||
})
|
||||
|
||||
t.Run("active branch filter", func(t *testing.T) {
|
||||
// find current branch
|
||||
out, _ := exec.CommandContext(ctx, "git", "rev-parse", "--abbrev-ref", "HEAD").Output()
|
||||
current := strings.TrimSpace(string(out))
|
||||
|
||||
res := core.Lookup("git checkout ")
|
||||
for _, r := range res {
|
||||
if strings.Contains(r.Cmd, current) && !strings.Contains(r.Cmd, "remotes/") {
|
||||
t.Errorf("Should not suggest active branch '%s'", current)
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user