mirror of
https://gitea.com/gitea/tea.git
synced 2026-10-26 19:11: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>
109 lines
3.9 KiB
Go
109 lines
3.9 KiB
Go
// Copyright 2026 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package app
|
|
|
|
import (
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/spf13/cobra"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func TestParseRunTime(t *testing.T) {
|
|
now := time.Date(2028, 2, 1, 12, 0, 0, 0, time.UTC)
|
|
plus2 := time.FixedZone("UTC+2", 2*60*60)
|
|
for _, tc := range []struct {
|
|
input string
|
|
expected time.Time
|
|
}{
|
|
{"24h", now.Add(-24 * time.Hour)},
|
|
{"0s", now},
|
|
{"2028-01-01", time.Date(2028, 1, 1, 0, 0, 0, 0, plus2)},
|
|
{"2028-01-01T00:30:00+02:00", time.Date(2027, 12, 31, 22, 30, 0, 0, time.UTC)},
|
|
{"2028-01-01 08:00", time.Date(2028, 1, 1, 8, 0, 0, 0, plus2)},
|
|
} {
|
|
result, err := parseRunTime(tc.input, now.In(plus2))
|
|
require.NoError(t, err)
|
|
require.True(t, result.Equal(tc.expected), tc.input)
|
|
}
|
|
for _, input := range []string{"", "-24h", "not-a-date", "2028-02-30"} {
|
|
_, err := parseRunTime(input, now)
|
|
require.Error(t, err, input)
|
|
}
|
|
}
|
|
|
|
func TestParseTimeRangeRejectsOnlyInvertedBounds(t *testing.T) {
|
|
for _, tc := range []struct {
|
|
since, until string
|
|
wantErr bool
|
|
}{
|
|
{"2026-10-01", "2026-10-02", false},
|
|
{"2026-10-01", "2026-10-01", false},
|
|
{"2026-10-02", "2026-10-01", true},
|
|
} {
|
|
cmd := &cobra.Command{}
|
|
var bounds timeRange
|
|
bounds.register(cmd, "since", "", "until", "")
|
|
require.NoError(t, cmd.Flags().Parse([]string{"--since=" + tc.since, "--until=" + tc.until}))
|
|
_, _, err := bounds.parse(time.Now())
|
|
require.Equal(t, tc.wantErr, err != nil, tc.since+".."+tc.until)
|
|
}
|
|
}
|
|
|
|
func TestNumberAcceptsHashPrefix(t *testing.T) {
|
|
for raw, want := range map[string]int64{"12": 12, "#12": 12} {
|
|
n, err := number(raw)
|
|
require.NoError(t, err, raw)
|
|
require.Equal(t, want, n, raw)
|
|
}
|
|
for _, raw := range []string{"#", "##1", "0", "#-1", "1#", "abc"} {
|
|
_, err := number(raw)
|
|
require.ErrorContains(t, err, "invalid resource number", raw)
|
|
}
|
|
}
|
|
|
|
func TestUsageArgumentsSplitTopLevelGroups(t *testing.T) {
|
|
for use, want := range map[string][]string{
|
|
"list": nil,
|
|
"list [flags]": nil,
|
|
"view <number>": {"<number>"},
|
|
"view [number]": {"[number]"},
|
|
"close <number>...": {"<number>..."},
|
|
"clone <repository> [directory]": {"<repository>", "[directory]"},
|
|
"diff [<number> | <url> | <branch>]": {"[<number> | <url> | <branch>]"},
|
|
"download <tag> <asset-id> [flags]": {"<tag>", "<asset-id>"},
|
|
"upload <tag> <file>... [flags]": {"<tag>", "<file>..."},
|
|
} {
|
|
require.Equal(t, want, usageArguments(use), use)
|
|
}
|
|
}
|
|
|
|
func TestArgumentErrorsShowTheUsageLine(t *testing.T) {
|
|
for _, tc := range []struct {
|
|
args []string
|
|
want string
|
|
}{
|
|
{[]string{"issue", "view"}, "missing issue number\nUsage: tea issue view <number> [flags]\nRun 'tea issue view --help' for more information."},
|
|
{[]string{"issue", "view", "1", "2"}, "too many arguments\nUsage: tea issue view <number> [flags]"},
|
|
{[]string{"issue", "list", "extra"}, "unexpected argument \"extra\"\nUsage: tea issue list [flags]"},
|
|
{[]string{"pr", "checkout"}, "missing pull request number\nUsage: tea pr checkout {<number> | <url> | <branch>} [flags]"},
|
|
{[]string{"run", "view"}, "missing run ID\nUsage: tea run view [<run-id>] [flags]"},
|
|
{[]string{"release", "asset", "edit", "v1"}, "missing asset\nUsage: tea release asset edit <tag> <asset> [flags]"},
|
|
{[]string{"repo", "clone"}, "missing repository\nUsage: tea repo clone <repository> [<directory>] [-- <gitflags>...] [flags]"},
|
|
} {
|
|
requireUsageBeforeRequests(t, tc.want, tc.args...)
|
|
}
|
|
}
|
|
|
|
func TestLimitAcceptsShorthandUpToOneThousand(t *testing.T) {
|
|
var limit, page int
|
|
cmd := &cobra.Command{Use: "list"}
|
|
pageFlags(cmd, &limit, &page)
|
|
require.Equal(t, 30, limit)
|
|
require.NoError(t, cmd.Flags().Parse([]string{"-L", "1000"}))
|
|
require.Equal(t, 1000, limit)
|
|
require.ErrorContains(t, cmd.Flags().Parse([]string{"-L", "1001"}), "must be 1..1000")
|
|
}
|