mirror of
https://gitea.com/gitea/tea.git
synced 2026-10-26 19:11:25 +01:00
bircni
c5f674111a
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>
102 lines
2.4 KiB
Go
102 lines
2.4 KiB
Go
// Copyright 2026 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package comments
|
|
|
|
import (
|
|
"io"
|
|
"strings"
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func TestResolveBody(t *testing.T) {
|
|
testCases := []struct {
|
|
name string
|
|
positional string
|
|
description string
|
|
stdinPiped bool
|
|
stdin string
|
|
expected string
|
|
}{
|
|
{
|
|
name: "positional only",
|
|
positional: "from positional",
|
|
expected: "from positional",
|
|
},
|
|
{
|
|
name: "description flag only",
|
|
description: "from -d",
|
|
expected: "from -d",
|
|
},
|
|
{
|
|
name: "positional wins over description for back-compat",
|
|
positional: "from positional",
|
|
description: "from -d",
|
|
expected: "from positional",
|
|
},
|
|
{
|
|
name: "description wins over piped stdin",
|
|
description: "from -d",
|
|
stdinPiped: true,
|
|
stdin: "from stdin",
|
|
expected: "from -d",
|
|
},
|
|
{
|
|
name: "piped stdin used when nothing else given",
|
|
stdinPiped: true,
|
|
stdin: "from stdin",
|
|
expected: "from stdin",
|
|
},
|
|
{
|
|
name: "stdin ignored when not piped (interactive terminal)",
|
|
stdinPiped: false,
|
|
stdin: "should never be read",
|
|
expected: "",
|
|
},
|
|
{
|
|
name: "empty when no source provided",
|
|
stdinPiped: false,
|
|
expected: "",
|
|
},
|
|
{
|
|
name: "piped but empty stdin yields empty body",
|
|
stdinPiped: true,
|
|
stdin: "",
|
|
expected: "",
|
|
},
|
|
}
|
|
|
|
for _, tc := range testCases {
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
body, err := resolveBody(tc.positional, tc.description, tc.stdinPiped, strings.NewReader(tc.stdin))
|
|
require.NoError(t, err)
|
|
assert.Equal(t, tc.expected, body)
|
|
})
|
|
}
|
|
}
|
|
|
|
// TestResolveBodyDoesNotReadStdinWhenBodyGiven guards the original bug: when a
|
|
// body is supplied positionally (or via -d), stdin must not be consumed, so the
|
|
// command can never block on a non-TTY stdin under CI / agent harnesses.
|
|
func TestResolveBodyDoesNotReadStdinWhenBodyGiven(t *testing.T) {
|
|
reader := &trackingReader{}
|
|
|
|
body, err := resolveBody("positional body", "", true, reader)
|
|
require.NoError(t, err)
|
|
assert.Equal(t, "positional body", body)
|
|
assert.False(t, reader.read, "stdin must not be read when a body is supplied")
|
|
}
|
|
|
|
// trackingReader records whether Read was ever called.
|
|
type trackingReader struct {
|
|
read bool
|
|
}
|
|
|
|
func (r *trackingReader) Read(p []byte) (int, error) {
|
|
r.read = true
|
|
return 0, io.EOF
|
|
}
|