mirror of
https://gitea.com/gitea/tea.git
synced 2026-10-26 11:01:25 +01:00
feat!: rebuild tea on Cobra with explicit noun/verb commands (#1126)
- **switch tea to the Cobra command tree:** `internal/app` wires the packages from parts 1–4 into explicit noun/verb commands with `--repo`, `--json` / `--jq`, `--sudo` and `--debug`; `main.go` points at it. Build, release and docs tooling (`tools/cli-docs`, Makefile, goreleaser, snap, CI) and README / CONTRIBUTING are updated. - **remove the urfave/cli command tree:** deletes `cmd/`, `modules/`, the old integration tests, contrib completion scripts and the generated `docs/CLI.md`, and drops their dependencies. This commit only deletes. ## Breaking changes This is a breaking release. It requires Gitea 28 or newer; configuration moves to separate `config.yml` and `hosts.yml` files and requires fresh authentication, and command names, aliases, flags and output formats change. `docs/migration-1.0.md` maps every old command, flag and environment variable to its replacement. ## Issues fixes #1118 fixes #1116 fixes #1115 fixes #1094 fixes #1091 fixes #1073 fixes #1052 fixes #1032 fixes #1023 fixes #966 fixes #908 fixes #833 fixes #831 fixes #817 fixes #804 fixes #779 fixes #770 fixes #737 fixes #697 fixes #726 fixes #677 fixes #672 fixes #633 fixes #632 fixes #560 fixes #556 fixes #523 fixes #516 fixes #510 fixes #504 fixes #500 fixes #482 fixes #406 fixes #403 fixes #373 fixes #351 fixes #344 fixes #326 fixes #325 fixes #323 fixes #246 fixes #240 fixes #232 fixes #197 fixes #172 fixes #141 fixes #69 fixes #1110 fixes #569 fixes #480 fixes #666 fixes #670 fixes #457 fixes #643 fixes #498 fixes #490 fixes #1069 fixes #834 fixes #602 fixes #328 fixes #417 fixes #571 fixes #1029 fixes #489 fixes #1050 fixes #162 fixes #430 fixes #1087 fixes #683 Reviewed-on: https://gitea.com/gitea/tea/pulls/1126 Reviewed-by: TheFox0x7 <95654+thefox0x7@noreply.gitea.com>
This commit is contained in:
1 parent
12e415a7a7
commit
f02245449b
456 files changed
+18892
-34015
No files matched your search
@@ -1,146 +0,0 @@
|
||||
// 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())
|
||||
}
|
||||
Reference in new issue
Block a user