diff options
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 |