mirror of
https://gitea.com/gitea/tea.git
synced 2026-10-26 19:11:25 +01:00
Reverts #1126, #1125, #1124, #1123 and #1122. `go.mod` keeps the Go 1.26 line with toolchain `go1.26.9` (instead of the original `go1.26.6`) so the security fix from #1131 isn't lost. reopens #69 reopens #141 reopens #162 reopens #172 reopens #197 reopens #232 reopens #240 reopens #246 reopens #323 reopens #325 reopens #326 reopens #328 reopens #344 reopens #351 reopens #373 reopens #403 reopens #406 reopens #417 reopens #430 reopens #457 reopens #480 reopens #482 reopens #489 reopens #490 reopens #498 reopens #500 reopens #504 reopens #510 reopens #516 reopens #523 reopens #556 reopens #560 reopens #569 reopens #571 reopens #602 reopens #632 reopens #633 reopens #643 reopens #666 reopens #670 reopens #672 reopens #677 reopens #683 reopens #697 reopens #726 reopens #737 reopens #770 reopens #779 reopens #804 reopens #817 reopens #831 reopens #833 reopens #834 reopens #908 reopens #966 reopens #1023 reopens #1029 reopens #1032 reopens #1050 reopens #1052 reopens #1069 reopens #1073 reopens #1087 reopens #1091 reopens #1094 reopens #1110 reopens #1115 reopens #1116 reopens #1118 Reviewed-on: https://gitea.com/gitea/tea/pulls/1146 Reviewed-by: TheFox0x7 <95654+thefox0x7@noreply.gitea.com>
147 lines
4.4 KiB
Go
147 lines
4.4 KiB
Go
// Copyright 2026 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package task
|
|
|
|
import (
|
|
"fmt"
|
|
"net/http"
|
|
"net/http/httptest"
|
|
"strings"
|
|
"testing"
|
|
|
|
gitea "gitea.dev/sdk"
|
|
|
|
"gitea.dev/tea/modules/config"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
// mergeTestServer answers the merge POST with mergeStatus and the PR GET with
|
|
// prJSON, or a 404 if prJSON is empty.
|
|
func mergeTestServer(t *testing.T, prJSON string, mergeStatus int) *httptest.Server {
|
|
t.Helper()
|
|
|
|
return httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
|
w.Header().Set("Content-Type", "application/json")
|
|
|
|
switch {
|
|
case r.Method == http.MethodPost && strings.HasSuffix(r.URL.Path, "/merge"):
|
|
w.WriteHeader(mergeStatus)
|
|
// Gitea explains itself here; the SDK discards it.
|
|
_, _ = w.Write([]byte(`{"message":"Please try again later"}`))
|
|
case r.Method == http.MethodGet:
|
|
if prJSON == "" {
|
|
w.WriteHeader(http.StatusNotFound)
|
|
_, _ = w.Write([]byte(`{"message":"pull request does not exist"}`))
|
|
return
|
|
}
|
|
_, _ = w.Write([]byte(prJSON))
|
|
default:
|
|
t.Errorf("unexpected request: %s %s", r.Method, r.URL.Path)
|
|
w.WriteHeader(http.StatusInternalServerError)
|
|
}
|
|
}))
|
|
}
|
|
|
|
func pullJSON(state string, merged, draft, mergeable bool) string {
|
|
return fmt.Sprintf(
|
|
`{"number":3,"state":%q,"merged":%t,"draft":%t,"mergeable":%t,"head":{"sha":"abc123"}}`,
|
|
state, merged, draft, mergeable)
|
|
}
|
|
|
|
func TestPullMerge(t *testing.T) {
|
|
tests := []struct {
|
|
name string
|
|
pr string
|
|
mergeStatus int
|
|
wantErr string
|
|
}{
|
|
{
|
|
name: "success",
|
|
pr: pullJSON("open", false, false, true),
|
|
mergeStatus: http.StatusOK,
|
|
},
|
|
{
|
|
name: "created is also success",
|
|
pr: pullJSON("open", false, false, true),
|
|
mergeStatus: http.StatusCreated,
|
|
},
|
|
{
|
|
// gitea/tea#1022: an open PR with conflicts was reported as
|
|
// possibly not open.
|
|
name: "conflicting files",
|
|
pr: pullJSON("open", false, false, false),
|
|
mergeStatus: http.StatusMethodNotAllowed,
|
|
wantErr: "failed to merge PR #3: it has conflicting files or is otherwise not mergeable",
|
|
},
|
|
{
|
|
name: "already merged",
|
|
pr: pullJSON("closed", true, false, false),
|
|
mergeStatus: http.StatusMethodNotAllowed,
|
|
wantErr: "failed to merge PR #3: it has already been merged",
|
|
},
|
|
{
|
|
name: "closed",
|
|
pr: pullJSON("closed", false, false, false),
|
|
mergeStatus: http.StatusMethodNotAllowed,
|
|
wantErr: "failed to merge PR #3: it is closed",
|
|
},
|
|
{
|
|
name: "draft",
|
|
pr: pullJSON("open", false, true, false),
|
|
mergeStatus: http.StatusMethodNotAllowed,
|
|
wantErr: "failed to merge PR #3: it is a draft; mark it ready for review first",
|
|
},
|
|
{
|
|
// Open and mergeable, yet refused.
|
|
name: "refused while mergeable",
|
|
pr: pullJSON("open", false, false, true),
|
|
mergeStatus: http.StatusMethodNotAllowed,
|
|
wantErr: "failed to merge PR #3: the server refused the merge; check required status checks, requested reviews, or branch protection rules",
|
|
},
|
|
}
|
|
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
server := mergeTestServer(t, tt.pr, tt.mergeStatus)
|
|
defer server.Close()
|
|
|
|
err := PullMerge(t.Context(), &config.Login{
|
|
Name: "test",
|
|
URL: server.URL,
|
|
Token: "secret-token",
|
|
VersionCheck: false,
|
|
}, "owner", "repo", 3, gitea.MergePullRequestOption{Style: gitea.MergeStyleMerge})
|
|
|
|
if tt.wantErr == "" {
|
|
require.NoError(t, err)
|
|
return
|
|
}
|
|
require.Error(t, err)
|
|
assert.Equal(t, tt.wantErr, err.Error())
|
|
})
|
|
}
|
|
}
|
|
|
|
// A refusal must still explain itself when the follow-up PR lookup fails.
|
|
func TestPullMergeReasonUnavailable(t *testing.T) {
|
|
server := mergeTestServer(t, "", http.StatusMethodNotAllowed)
|
|
defer server.Close()
|
|
|
|
err := PullMerge(t.Context(), &config.Login{
|
|
Name: "test",
|
|
URL: server.URL,
|
|
Token: "secret-token",
|
|
VersionCheck: false,
|
|
}, "owner", "repo", 3, gitea.MergePullRequestOption{
|
|
Style: gitea.MergeStyleMerge,
|
|
// Set so the SDK skips its own pre-merge PR lookup.
|
|
HeadCommitId: "abc123",
|
|
})
|
|
|
|
require.Error(t, err)
|
|
assert.Equal(t, "failed to merge PR #3: the server refused the merge; check required status checks, requested reviews, or branch protection rules", err.Error())
|
|
}
|