Git/gitea-tea
1
0 Fork 0
mirror of https://gitea.com/gitea/tea.git synced 2026-10-26 11:01:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

test: merge duplicate terminal, git and Actions service tests

Browse Source 
Signed-off-by: bircni <bircni@icloud.com>
This commit is contained in:
bircni committed 2026-10-12 20:49:32 +02:00
1 parent aee57be8b9
commit 9df6cb7dd3
6 files changed
+38 -136
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

internal/git/sync_test.go
+4 -18
View File
@@ -145,6 +145,10 @@ func TestSyncBranchRefusesWhatItCannotFastForward(t *testing.T) {
f.git(f.work, "switch", "experiment")
},
},
{
name: "checked out in another worktree", message: "main is checked out in the worktree",
prepare: func(f syncFixture) { f.git(f.work, "worktree", "add", filepath.Join(t.TempDir(), "linked"), "main") },
},
} {
t.Run(tc.name, func(t *testing.T) {
f := newSyncFixture(t)
@@ -158,24 +162,6 @@ func TestSyncBranchRefusesWhatItCannotFastForward(t *testing.T) {
}
}
func TestSyncBranchRefusesABranchCheckedOutInAnotherWorktree(t *testing.T) {
f := newSyncFixture(t)
linked := filepath.Join(t.TempDir(), "linked")
f.git(f.work, "worktree", "add", linked, "main")
before := f.git(f.work, "rev-parse", "main")
_, err := f.sync("main")
require.ErrorContains(t, err, "main is checked out in the worktree")
require.Equal(t, before, f.git(f.work, "rev-parse", "main"))
require.Equal(t, "experiment", f.git(f.work, "branch", "--show-current"))
}
func TestWorktreeWithBranch(t *testing.T) {
porcelain := "worktree /src\nHEAD abc\nbranch refs/heads/experiment\n\nworktree /linked\nHEAD def\nbranch refs/heads/main\n\nworktree /detached\nHEAD 123\ndetached\n"
require.Equal(t, "/linked", worktreeWithBranch(porcelain, "refs/heads/main"))
require.Equal(t, "/src", worktreeWithBranch(porcelain, "refs/heads/experiment"))
require.Empty(t, worktreeWithBranch(porcelain, "refs/heads/other"))
}
func TestSyncBranchValidatesItsInput(t *testing.T) {
f := newSyncFixture(t)
_, err := SyncBranch(context.Background(), f.runner, SyncOptions{Directory: f.work, Remote: "origin"})