Sep 15, 2023 · Sep 15, 2023
diff --git a/cli/clitest/clitest.go b/cli/clitest/clitest.go

 // New creates a CLI instance with a configuration pointed to a
 // temporary testing directory.
 func New(t*testing.T, args ...string) (*clibase.Invocation, config.Root) {
 func New(t testing.TB, args ...string) (*clibase.Invocation, config.Root) {
 var root cli.RootCmd

 cmd, err := root.Command(root.AGPL())
 }

 func NewWithCommand(
 t*testing.T, cmd *clibase.Cmd, args ...string,
 t testing.TB, cmd *clibase.Cmd, args ...string,
 ) (*clibase.Invocation, config.Root) {
 configDir := config.Root(t.TempDir())
 logger := slogtest.Make(t, nil)
diff --git a/cli/clitest/golden.go b/cli/clitest/golden.go
 "strings"
 "testing"

 "github.com/muesli/termenv"
 "github.com/stretchr/testify/require"

 "github.com/coder/coder/v2/cli/clibase"
 "github.com/coder/coder/v2/cli/cliui"
 "github.com/coder/coder/v2/cli/config"
 "github.com/coder/coder/v2/coderd/coderdtest"
 "github.com/coder/coder/v2/coderd/database/dbtestutil"

 // TestCommandHelp will test the help output of the given commands
 // using golden files.
 //
 //nolint:tparallel,paralleltest
 func TestCommandHelp(t *testing.T, getRoot func(t *testing.T) *clibase.Cmd, cases []CommandHelpCase) {
 // ANSI256 escape codes are far easier for humans to parse in a diff,
 // but TrueColor is probably more popular with modern terminals.
 cliui.TestColor(t, termenv.ANSI)
 t.Parallel()
 rootClient, replacements := prepareTestData(t)

 root := getRoot(t)
diff --git a/cli/cliui/agent_test.go b/cli/cliui/agent_test.go
 line := s.Text()
 t.Log(line)
 if len(tc.want) == 0 {
 require.Fail(t, "unexpected line: "+line)
 require.Fail(t, "unexpected line",line)
 }
 require.Contains(t, line, tc.want[0])
 tc.want = tc.want[1:]
diff --git a/cli/cliui/cliui.go b/cli/cliui/cliui.go
 package cliui

 import (
 "flag"
 "os"
 "testing"
 "sync"
 "time"

 "github.com/muesli/termenv"
 Wrap pretty.Style
 }

 var color = termenv.NewOutput(os.Stdout).ColorProfile()

 // TestColor sets the color profile to the given profile for the duration of the
 // test.
 // WARN: Must not be used in parallel tests.
 func TestColor(t *testing.T, tprofile termenv.Profile) {
 old := color
 color = tprofile
 t.Cleanup(func() {
 color = old
 })
 }
 var (
 color     termenv.Profile
 colorOnce sync.Once
 )

 var (
 Green   =color.Color("#04B575")
 Red     =color.Color("#ED567A")
 Fuchsia =color.Color("#EE6FF8")
 Yellow  =color.Color("#ECFD65")
 Blue    =color.Color("#5000ff")
 Green   = Color("#04B575")
 Red     = Color("#ED567A")
 Fuchsia = Color("#EE6FF8")
 Yellow  = Color("#ECFD65")
 Blue    = Color("#5000ff")
 )

 // Color returns a color for the given string.
 func Color(s string) termenv.Color {
 colorOnce.Do(func() {
 color = termenv.NewOutput(os.Stdout).ColorProfile()
 if flag.Lookup("test.v") != nil {
 // Use a consistent colorless profile in tests so that results
 // are deterministic.
 color = termenv.Ascii
 }
 })
 return color.Color(s)
 }

diff --git a/cli/cliui/resources_internal_test.go b/cli/cliui/resources_internal_test.go
 t.Run(testCase.name, func(t *testing.T) {
 t.Parallel()
 actual := renderAgentVersion(testCase.agentVersion, testCase.serverVersion)
 assert.Equal(t, testCase.expected, actual)
 assert.Equal(t, testCase.expected,(actual))
 })
 }
 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -29,7 +29,7 @@ import (

		// New creates a CLI instance with a configuration pointed to a
		// temporary testing directory.
		func New(ttesting.T, args ...string) (clibase.Invocation, config.Root) {
		func New(t testing.TB, args ...string) (*clibase.Invocation, config.Root) {
		var root cli.RootCmd

		cmd, err := root.Command(root.AGPL())
Expand All		@@ -56,7 +56,7 @@ func (l *logWriter) Write(p []byte) (n int, err error) {
		}

		func NewWithCommand(
		ttesting.T, cmd clibase.Cmd, args ...string,
		t testing.TB, cmd *clibase.Cmd, args ...string,
		) (*clibase.Invocation, config.Root) {
		configDir := config.Root(t.TempDir())
		logger := slogtest.Make(t, nil)
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -11,11 +11,9 @@ import (
		"strings"
		"testing"

		"github.com/muesli/termenv"
		"github.com/stretchr/testify/require"

		"github.com/coder/coder/v2/cli/clibase"
		"github.com/coder/coder/v2/cli/cliui"
		"github.com/coder/coder/v2/cli/config"
		"github.com/coder/coder/v2/coderd/coderdtest"
		"github.com/coder/coder/v2/coderd/database/dbtestutil"
Expand DownExpand Up		@@ -50,12 +48,8 @@ func DefaultCases() []CommandHelpCase {

		// TestCommandHelp will test the help output of the given commands
		// using golden files.
		//
		//nolint:tparallel,paralleltest
		func TestCommandHelp(t testing.T, getRoot func(t testing.T) *clibase.Cmd, cases []CommandHelpCase) {
		// ANSI256 escape codes are far easier for humans to parse in a diff,
		// but TrueColor is probably more popular with modern terminals.
		cliui.TestColor(t, termenv.ANSI)
		t.Parallel()
		rootClient, replacements := prepareTestData(t)

		root := getRoot(t)
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -340,7 +340,7 @@ func TestAgent(t *testing.T) {
		line := s.Text()
		t.Log(line)
		if len(tc.want) == 0 {
		require.Fail(t, "unexpected line: "+line)
		require.Fail(t, "unexpected line",line)
		}
		require.Contains(t, line, tc.want[0])
		tc.want = tc.want[1:]
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -1,8 +1,9 @@
		package cliui

		import (
		"flag"
		"os"
		"testing"
		"sync"
		"time"

		"github.com/muesli/termenv"
Expand DownExpand Up		@@ -30,29 +31,29 @@ type Styles struct {
		Wrap pretty.Style
		}

		var color = termenv.NewOutput(os.Stdout).ColorProfile()

		// TestColor sets the color profile to the given profile for the duration of the
		// test.
		// WARN: Must not be used in parallel tests.
		func TestColor(t *testing.T, tprofile termenv.Profile) {
		old := color
		color = tprofile
		t.Cleanup(func() {
		color = old
		})
		}
		var (
		color termenv.Profile
		colorOnce sync.Once
		)

		var (
		Green =color.Color("#04B575")
		Red =color.Color("#ED567A")
		Fuchsia =color.Color("#EE6FF8")
		Yellow =color.Color("#ECFD65")
		Blue =color.Color("#5000ff")
		Green = Color("#04B575")
		Red = Color("#ED567A")
		Fuchsia = Color("#EE6FF8")
		Yellow = Color("#ECFD65")
		Blue = Color("#5000ff")
		)

		// Color returns a color for the given string.
		func Color(s string) termenv.Color {
		colorOnce.Do(func() {
		color = termenv.NewOutput(os.Stdout).ColorProfile()
		if flag.Lookup("test.v") != nil {
		// Use a consistent colorless profile in tests so that results
		// are deterministic.
		color = termenv.Ascii
		}
		})
		return color.Color(s)
		}

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -44,7 +44,7 @@ func TestRenderAgentVersion(t *testing.T) {
		t.Run(testCase.name, func(t *testing.T) {
		t.Parallel()
		actual := renderAgentVersion(testCase.agentVersion, testCase.serverVersion)
		assert.Equal(t, testCase.expected, actual)
		assert.Equal(t, testCase.expected,(actual))
		})
		}
		}