Skip to content

Commit bad9ae0

Browse files
committed
Fix test
1 parent 94424b7 commit bad9ae0

File tree

2 files changed

+1
-7
lines changed

2 files changed

+1
-7
lines changed

tests/integration/api_branch_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ func TestAPICreateBranchWithSyncBranches(t *testing.T) {
320320
RepoID: 1,
321321
})
322322
assert.NoError(t, err)
323-
assert.Len(t, branches, 9)
323+
assert.Len(t, branches, 10)
324324

325325
branches, err = db.Find[git_model.Branch](t.Context(), git_model.FindBranchOptions{
326326
RepoID: 1,

tests/integration/pull_merge_test.go

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -409,12 +409,6 @@ func TestCantMergeUnrelated(t *testing.T) {
409409
assert.NoError(t, err)
410410
defer gitRepo1.Close()
411411

412-
_, _, err = gitcmd.NewCommand("branch", "unrelated").
413-
AddDynamicArguments(commitSha).
414-
WithDir(path).
415-
RunStdString(t.Context())
416-
assert.NoError(t, err)
417-
418412
assert.NoError(t, repo_service.CreateNewBranchFromCommit(t.Context(), user1, repo1, gitRepo1, commitSha, "unrelated"))
419413

420414
testEditFileToNewBranch(t, session, "user1", "repo1", "master", "conflict", "README.md", "Hello, World (Edited Once)\n")

0 commit comments

Comments
 (0)