diff options
| author | zeripath <art27@cantab.net> | 2020-11-08 19:23:00 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-08 19:23:00 +0000 |
| commit | 8ae5548188ed791aa2abfb50be251608989f40cb (patch) | |
| tree | 22c4ac26d4ec4180204e3e204011ee15bbad321a | |
| parent | 004b40dad0c06d3936e8c142bef142013c1f60a3 (diff) | |
| download | gitea-8ae5548188ed791aa2abfb50be251608989f40cb.tar.gz gitea-8ae5548188ed791aa2abfb50be251608989f40cb.zip | |
2nd attempt at re-request APIMergePullRequest (#13468)
Signed-off-by: Andrew Thornton <art27@cantab.net>
| -rw-r--r-- | integrations/api_helper_for_declarative_test.go | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/integrations/api_helper_for_declarative_test.go b/integrations/api_helper_for_declarative_test.go index b0031ef332..b8e513958e 100644 --- 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) } |