From b74b7b3c40db6322f1d2dac0942d49833b4bf7f2 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Sat, 22 Mar 2025 14:54:27 +0100 Subject: [PATCH] internal/prompt: TestConfirm: don't use un-keyed structs Signed-off-by: Sebastiaan van Stijn --- internal/prompt/prompt_test.go | 70 +++++++++++++++++++++++----------- 1 file changed, 47 insertions(+), 23 deletions(-) diff --git a/internal/prompt/prompt_test.go b/internal/prompt/prompt_test.go index 18df7e237f..2c9abfa7c7 100644 --- a/internal/prompt/prompt_test.go +++ b/internal/prompt/prompt_test.go @@ -109,29 +109,53 @@ func TestConfirm(t *testing.T) { f func() error expected promptResult }{ - {"SIGINT", func() error { - _ = syscall.Kill(syscall.Getpid(), syscall.SIGINT) - return nil - }, promptResult{false, prompt.ErrTerminated}}, - {"no", func() error { - _, err := fmt.Fprintln(promptWriter, "n") - return err - }, promptResult{false, nil}}, - {"yes", func() error { - _, err := fmt.Fprintln(promptWriter, "y") - return err - }, promptResult{true, nil}}, - {"any", func() error { - _, err := fmt.Fprintln(promptWriter, "a") - return err - }, promptResult{false, nil}}, - {"with space", func() error { - _, err := fmt.Fprintln(promptWriter, " y") - return err - }, promptResult{true, nil}}, - {"reader closed", func() error { - return promptReader.Close() - }, promptResult{false, nil}}, + { + desc: "SIGINT", + f: func() error { + _ = syscall.Kill(syscall.Getpid(), syscall.SIGINT) + return nil + }, + expected: promptResult{false, prompt.ErrTerminated}, + }, + { + desc: "no", + f: func() error { + _, err := fmt.Fprintln(promptWriter, "n") + return err + }, + expected: promptResult{false, nil}, + }, + { + desc: "yes", + f: func() error { + _, err := fmt.Fprintln(promptWriter, "y") + return err + }, + expected: promptResult{true, nil}, + }, + { + desc: "any", + f: func() error { + _, err := fmt.Fprintln(promptWriter, "a") + return err + }, + expected: promptResult{false, nil}, + }, + { + desc: "with space", + f: func() error { + _, err := fmt.Fprintln(promptWriter, " y") + return err + }, + expected: promptResult{true, nil}, + }, + { + desc: "reader closed", + f: func() error { + return promptReader.Close() + }, + expected: promptResult{false, nil}, + }, } { t.Run(tc.desc, func(t *testing.T) { notifyCtx, notifyCancel := signal.NotifyContext(ctx, syscall.SIGINT, syscall.SIGTERM)