diff options
| author | KN4CK3R <admin@oldschoolhack.me> | 2023-04-22 23:56:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-22 17:56:27 -0400 |
| commit | f1173d6879cb26af21483037fae72542f3088408 (patch) | |
| tree | a1ed73fb2a42c351005974698076f5ee82489d5d /tests/integration/pull_merge_test.go | |
| parent | ac384c4e1d207a989d0f646ebc14fd0c26427d4c (diff) | |
| download | gitea-f1173d6879cb26af21483037fae72542f3088408.tar.gz gitea-f1173d6879cb26af21483037fae72542f3088408.zip | |
Use more specific test methods (#24265)
Co-authored-by: silverwind <me@silverwind.io>
Co-authored-by: Giteabot <teabot@gitea.io>
Diffstat (limited to 'tests/integration/pull_merge_test.go')
| -rw-r--r-- | tests/integration/pull_merge_test.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/integration/pull_merge_test.go b/tests/integration/pull_merge_test.go index ee185f2238..9271f25e5f 100644 --- a/tests/integration/pull_merge_test.go +++ b/tests/integration/pull_merge_test.go @@ -414,7 +414,7 @@ func TestConflictChecking(t *testing.T) { assert.NoError(t, err) // Ensure conflictedFiles is populated. - assert.Equal(t, 1, len(conflictingPR.ConflictedFiles)) + assert.Len(t, conflictingPR.ConflictedFiles, 1) // Check if status is correct. assert.Equal(t, issues_model.PullRequestStatusConflict, conflictingPR.Status) // Ensure that mergeable returns false |