mirror of
https://gitea.com/gitea/tea.git
synced 2026-10-26 19:11:25 +01:00
bircni
4895aa089d
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>
68 lines
2.9 KiB
Go
68 lines
2.9 KiB
Go
// Copyright 2026 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package app
|
|
|
|
import (
|
|
"context"
|
|
"os"
|
|
"testing"
|
|
|
|
"gitea.dev/tea/internal/clierr"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func TestPullMergeSendsTitleAndMessage(t *testing.T) {
|
|
var payload map[string]any
|
|
server := newAuthenticatedServer(mergeServer(t, openPull, &payload))
|
|
defer server.Close()
|
|
deps, _, _ := serverDeps(t, server.URL)
|
|
require.NoError(t, Execute(context.Background(), deps, []string{
|
|
"pr", "merge", "3", "-R", "alice/project", "--method", "squash",
|
|
"--title", "Squash title", "--message", "Squash body", "--delete-branch=false", "--yes",
|
|
}))
|
|
require.Equal(t, "squash", payload["Do"])
|
|
require.Equal(t, "Squash title", payload["MergeTitleField"])
|
|
require.Equal(t, "Squash body", payload["MergeMessageField"])
|
|
require.Equal(t, false, payload["delete_branch_after_merge"])
|
|
require.Equal(t, "abc123", payload["head_commit_id"])
|
|
|
|
payload = nil
|
|
server = newAuthenticatedServer(mergeServer(t, openPull, &payload))
|
|
defer server.Close()
|
|
deps.Getenv = serverEnv(server.URL, nil)
|
|
require.NoError(t, Execute(context.Background(), deps, []string{"pr", "merge", "3", "-R", "alice/project", "--style", "rebase", "--yes"}))
|
|
require.Equal(t, "rebase", payload["Do"])
|
|
}
|
|
|
|
func TestPullMergeMessageFileAndEditor(t *testing.T) {
|
|
var payload map[string]any
|
|
deps, _, _ := testDeps(t)
|
|
file := t.TempDir() + "/message.md"
|
|
require.NoError(t, os.WriteFile(file, []byte("from file"), 0o600))
|
|
server := newAuthenticatedServer(mergeServer(t, openPull, &payload))
|
|
defer server.Close()
|
|
deps.Getenv = serverEnv(server.URL, map[string]string{"EDITOR": "chosen-editor"})
|
|
require.NoError(t, Execute(context.Background(), deps, []string{"pr", "merge", "3", "-R", "alice/project", "--message-file", file, "--yes"}))
|
|
require.Equal(t, "from file", payload["MergeMessageField"])
|
|
|
|
server = newAuthenticatedServer(mergeServer(t, openPull, &payload))
|
|
defer server.Close()
|
|
deps.Getenv = serverEnv(server.URL, map[string]string{"EDITOR": "chosen-editor"})
|
|
deps.Editor, _ = newDraftEditor(t, "from editor")
|
|
require.NoError(t, Execute(context.Background(), deps, []string{"pr", "merge", "3", "-R", "alice/project", "--editor", "--yes", "--no-input"}))
|
|
require.Equal(t, "from editor", payload["MergeMessageField"])
|
|
require.Equal(t, clierr.Usage, clierr.ExitCode(Execute(context.Background(), deps, []string{
|
|
"pr", "merge", "3", "-R", "alice/project", "--message", "x", "--editor", "--yes",
|
|
})))
|
|
}
|
|
|
|
func TestPullMergeReturnsTheMergedPullRequest(t *testing.T) {
|
|
var payload map[string]any
|
|
server := newAuthenticatedServer(mergeServer(t, openPull, &payload))
|
|
defer server.Close()
|
|
deps, out, _ := serverDeps(t, server.URL)
|
|
require.NoError(t, Execute(context.Background(), deps, []string{"pr", "merge", "3", "-R", "alice/project", "--yes", "--json", "number,merged"}))
|
|
require.JSONEq(t, `{"number":3,"merged":true}`, out.String())
|
|
}
|