Skip to content

Commit 50d3d94

Browse files
committed
Fix merge test
1 parent 1183b33 commit 50d3d94

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

tests/integration/pull_merge_test.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,14 @@ func testPullMerge(t *testing.T, session *TestSession, user, repo, pullnum strin
6969

7070
assert.Equal(t, fmt.Sprintf("/%s/%s/pulls/%s", user, repo, pullnum), respJSON.Redirect)
7171

72+
pullnumInt, err := strconv.ParseInt(pullnum, 10, 64)
73+
assert.NoError(t, err)
74+
repository, err := repo_model.GetRepositoryByOwnerAndName(t.Context(), user, repo)
75+
assert.NoError(t, err)
76+
pull, err := issues_model.GetPullRequestByIndex(t.Context(), repository.ID, pullnumInt)
77+
assert.NoError(t, err)
78+
assert.True(t, pull.HasMerged)
79+
7280
return resp
7381
}
7482

0 commit comments

Comments
 (0)