Skip to content

Commit 797cb38

Browse files
6543zeripath
andauthored
2nd attempt at re-request APIMergePullRequest (#13468) (#13490)
Signed-off-by: Andrew Thornton <[email protected]> Co-authored-by: zeripath <[email protected]>
1 parent ae49559 commit 797cb38

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

integrations/api_helper_for_declarative_test.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,10 @@ func doAPIMergePullRequest(ctx APITestContext, owner, repo string, index int64)
235235
DecodeJSON(t, resp, &err)
236236
assert.EqualValues(t, "Please try again later", err.Message)
237237
queue.GetManager().FlushAll(context.Background(), 5*time.Second)
238+
req = NewRequestWithJSON(t, http.MethodPost, urlStr, &auth.MergePullRequestForm{
239+
MergeMessageField: "doAPIMergePullRequest Merge",
240+
Do: string(models.MergeStyleMerge),
241+
})
238242
resp = ctx.Session.MakeRequest(t, req, NoExpectedStatus)
239243
}
240244

0 commit comments

Comments
 (0)