2nd attempt at re-request APIMergePullRequest (#13468) (#13490)

Signed-off-by: Andrew Thornton <art27@cantab.net>
Co-authored-by: zeripath <art27@cantab.net>

diff --git a/integrations/api_helper_for_declarative_test.go b/integrations/api_helper_for_declarative_test.go
index b0031ef3329980202b94b5d6d7dd9a05e99633b3..b8e513958e841c20f825100cd5464b4ffc9b352a 100644 (file)
--- a/integrations/api_helper_for_declarative_test.go
+++ b/integrations/api_helper_for_declarative_test.go
@@ -235,6 +235,10 @@ func doAPIMergePullRequest(ctx APITestContext, owner, repo string, index int64)
                        DecodeJSON(t, resp, &err)
                        assert.EqualValues(t, "Please try again later", err.Message)
                        queue.GetManager().FlushAll(context.Background(), 5*time.Second)
+                       req = NewRequestWithJSON(t, http.MethodPost, urlStr, &auth.MergePullRequestForm{
+                               MergeMessageField: "doAPIMergePullRequest Merge",
+                               Do:                string(models.MergeStyleMerge),
+                       })
                        resp = ctx.Session.MakeRequest(t, req, NoExpectedStatus)
                }