domi/forgejo-domi
1
0
Fork 0
forked from forgejo/forgejo
Code Pull requests Activity

Some code improvements (#14266)

Browse source
This commit is contained in:
Lunny Xiao 2021-01-07 03:23:57 +08:00 • committed by GitHub
parent 8688c2be95
commit 3c96a37162
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 17 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
integrations/pull_merge_test.go
View file

@ -246,6 +246,7 @@ func TestCantMergeConflict(t *testing.T) {
err = pull.Merge(pr, user1, gitRepo, models.MergeStyleRebase, "CONFLICT")
assert.Error(t, err, "Merge should return an error due to conflict")
assert.True(t, models.IsErrRebaseConflicts(err), "Merge error is not a conflict error")
gitRepo.Close()
})
}
@ -329,5 +330,6 @@ func TestCantMergeUnrelated(t *testing.T) {
err = pull.Merge(pr, user1, gitRepo, models.MergeStyleMerge, "UNRELATED")
assert.Error(t, err, "Merge should return an error due to unrelated")
assert.True(t, models.IsErrMergeUnrelatedHistories(err), "Merge error is not a unrelated histories error")
gitRepo.Close()
})
}