mirror of
https://gitea.com/gitea/tea.git
synced 2026-10-26 11:01:25 +01:00
pr merge takes the method from the repository's default merge style instead of always merging (D22), accepts gh's --merge, --squash and --rebase next to -s/--method, refuses methods the repository disables, and adds -d/--delete-branch (defaulting to the repository setting), --auto, -t, -b, -F and -e. On a terminal it asks for the method and branch deletion with the defaults preselected, without a picker when the current branch has a pull request. It reports "✓ Squashed and merged pull request alice/x#3 (title)", the deleted remote branch, and switches off and deletes the local head branch; --json returns the merged pull request. Merged, closed and draft pull requests are reported before anything is asked. -s without a value points at --squash. pr checkout names the local branch after the head branch when that name is free or already at the head, falling back to OWNER/BRANCH for forks and pr/NUMBER (D13), fetches and switches quietly, reports "✓ Checked out #1 into feat/one", and has the alias co. pr clean reports what it deleted and that a remote branch was already gone. pr create asks for the title and body, then "What's next?": submit, submit as a draft, add metadata or change the branches, without the AGit question up front or a final confirmation. It pushes an unpushed head with --set-upstream --quiet ("✓ Pushed feat/one to origin"), prints "✓ Created pull request alice/x#9 (title)" and the URL, and adds --fill, --web, the alias new, the gh shorthands, and milestones by title. New tea pr ready [--undo]. pr close and reopen take -c/--comment, close takes -d/--delete-branch, and both say when the pull request already is in that state. pr edit reports "✓ Edited", takes the singular gh reviewer flags (the plurals still work), milestones by title and --remove-milestone. pr diff is colored and paged on a terminal and byte-exact when piped, with --name-only, --color and --web. Every pull request argument accepts #N, URLs and branch names and defaults to the current branch's pull request. Signed-off-by: bircni <bircni@icloud.com>
126 lines
5.8 KiB
Go
126 lines
5.8 KiB
Go
// Copyright 2026 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package app
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"net/http"
|
|
"testing"
|
|
|
|
"gitea.dev/tea/internal/clierr"
|
|
"gitea.dev/tea/internal/settings"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func TestPullCleanRejectsOpenPullBeforeGitMutation(t *testing.T) {
|
|
server := newAuthenticatedServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
|
switch r.URL.Path {
|
|
case "/api/v1/repos/alice/project":
|
|
_, _ = fmt.Fprint(w, `{"full_name":"alice/project","default_branch":"main"}`)
|
|
case "/api/v1/repos/alice/project/pulls/7":
|
|
_, _ = fmt.Fprint(w, `{"number":7,"state":"open","head":{"sha":"abc123","ref":"feature","repo":{"full_name":"alice/project","clone_url":"https://example.org/alice/project.git","permissions":{"push":true}}}}`)
|
|
default:
|
|
t.Errorf("unexpected path %s", r.URL.Path)
|
|
w.WriteHeader(http.StatusNotFound)
|
|
}
|
|
}))
|
|
defer server.Close()
|
|
deps, out, _ := serverDeps(t, server.URL)
|
|
runner := &fakeGit{}
|
|
deps.Git = runner
|
|
err := Execute(context.Background(), deps, []string{"pr", "clean", "7", "--repo", "alice/project", "--no-input"})
|
|
require.ErrorContains(t, err, "still open")
|
|
require.Empty(t, runner.calls)
|
|
require.Empty(t, out.String())
|
|
}
|
|
|
|
func TestPullCleanDeletesLocalAndRemoteBranches(t *testing.T) {
|
|
server := newAuthenticatedServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
|
switch r.URL.Path {
|
|
case "/api/v1/repos/alice/project":
|
|
_, _ = fmt.Fprint(w, `{"full_name":"alice/project","default_branch":"main","clone_url":"https://example.org/alice/project.git"}`)
|
|
case "/api/v1/repos/alice/project/pulls/7":
|
|
_, _ = fmt.Fprint(w, `{"number":7,"state":"closed","merged":true,"head":{"sha":"abc123","ref":"feature","label":"alice:feature","repo":{"full_name":"alice/project","clone_url":"https://example.org/alice/project.git","ssh_url":"ssh://git@example.org/alice/project.git","permissions":{"push":true}}}}`)
|
|
default:
|
|
t.Errorf("unexpected path %s", r.URL.Path)
|
|
w.WriteHeader(http.StatusNotFound)
|
|
}
|
|
}))
|
|
defer server.Close()
|
|
deps, out, _ := serverDeps(t, server.URL)
|
|
configureHost(t, deps, server.URL, settings.Host{User: "alice", Users: tokenAccounts(settings.StoreFile, "alice")})
|
|
deleteRemote := credentialCall(t, deps, server.URL, "alice", "push", "--delete", "--", "origin", "feature")
|
|
runner := &fakeGit{results: map[string]string{
|
|
deleteRemote: "",
|
|
"remote": "origin",
|
|
"remote get-url origin": "https://example.org/alice/project.git",
|
|
"rev-parse --is-inside-work-tree": "true",
|
|
"for-each-ref --format=%(objectname)%09%(refname:short)%09%(upstream:short) refs/heads/": "abc123\tpr/7\torigin/feature",
|
|
"check-ref-format --branch pr/7": "",
|
|
"check-ref-format --branch main": "",
|
|
"status --porcelain=v1 --untracked-files=normal": "",
|
|
"rev-parse --verify refs/heads/pr/7^{commit}": "abc123",
|
|
"rev-parse --verify refs/heads/main^{commit}": "mainsha",
|
|
"symbolic-ref --short HEAD": "pr/7",
|
|
"switch --quiet -- main": "",
|
|
"branch -D -- pr/7": "",
|
|
}}
|
|
deps.Git = runner
|
|
err := Execute(context.Background(), deps, []string{"pr", "clean", "7", "--repo", "alice/project", "--no-input", "--json"})
|
|
require.Equal(t, clierr.Usage, clierr.ExitCode(err))
|
|
require.ErrorContains(t, err, "--yes")
|
|
assertNoMutation := func() {
|
|
t.Helper()
|
|
for _, call := range runner.calls {
|
|
require.NotContains(t, call, "switch --")
|
|
require.NotContains(t, call, "branch -D")
|
|
require.NotContains(t, call, "push --delete")
|
|
}
|
|
require.Empty(t, out.String())
|
|
}
|
|
assertNoMutation()
|
|
runner.calls = nil
|
|
deps.Streams.InTTY, deps.Streams.ErrTTY = true, true
|
|
prompt := &scriptedPrompter{}
|
|
deps.Prompter = prompt
|
|
err = Execute(context.Background(), deps, []string{"pr", "clean", "7", "--repo", "alice/project"})
|
|
require.Equal(t, clierr.Canceled, clierr.ExitCode(err))
|
|
require.Len(t, prompt.confirmations, 1)
|
|
assertNoMutation()
|
|
runner.calls = nil
|
|
require.NoError(t, Execute(context.Background(), deps, []string{"pr", "clean", "7", "--repo", "alice/project", "--no-input", "--json", "--yes"}))
|
|
require.Contains(t, runner.calls, "branch -D -- pr/7")
|
|
require.Contains(t, runner.calls, "switch --quiet -- main")
|
|
require.Contains(t, runner.calls, deleteRemote)
|
|
require.Contains(t, out.String(), `"local_branch":"pr/7"`)
|
|
require.Contains(t, out.String(), `"remote_deleted":true`)
|
|
}
|
|
|
|
func TestPullCleanRequiresIgnoreSHAWhenHeadMissingLocally(t *testing.T) {
|
|
server := newAuthenticatedServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
|
switch r.URL.Path {
|
|
case "/api/v1/repos/alice/project":
|
|
_, _ = fmt.Fprint(w, `{"full_name":"alice/project","default_branch":"main"}`)
|
|
case "/api/v1/repos/alice/project/pulls/7":
|
|
_, _ = fmt.Fprint(w, `{"number":7,"state":"closed","head":{"sha":"abc123","ref":"feature","repo":{"full_name":"alice/project","clone_url":"https://example.org/alice/project.git","permissions":{"push":false}}}}`)
|
|
default:
|
|
w.WriteHeader(http.StatusNotFound)
|
|
}
|
|
}))
|
|
defer server.Close()
|
|
deps, out, _ := serverDeps(t, server.URL)
|
|
deps.Git = &fakeGit{results: map[string]string{
|
|
"remote": "origin",
|
|
"remote get-url origin": "https://example.org/alice/project.git",
|
|
"rev-parse --is-inside-work-tree": "true",
|
|
"for-each-ref --format=%(objectname)%09%(refname:short)%09%(upstream:short) refs/heads/": "deadbeef\tfeature\torigin/feature",
|
|
"rev-parse --verify refs/remotes/origin/feature^{commit}": "deadbeef",
|
|
}}
|
|
err := Execute(context.Background(), deps, []string{"pr", "clean", "7", "--repo", "alice/project", "--no-input"})
|
|
require.Equal(t, clierr.Usage, clierr.ExitCode(err))
|
|
require.ErrorContains(t, err, "--ignore-sha")
|
|
require.Empty(t, out.String())
|
|
}
|