fix: flaky tests

internal/app/helpers_test.go

@@ -133,7 +133,7 @@ type testLogger struct {
 func (l *testLogger) Write(b []byte) (int, error) {
 	l.t.Helper()
 
-	l.t.Log(string(b))
+	//l.t.Log(string(b))
 	return len(b), nil
 }
 

internal/app/main_test.go

@@ -0,0 +1,11 @@
+package app
+
+import (
+	"github.com/charmbracelet/lipgloss"
+	"github.com/muesli/termenv"
+)
+
+func init() {
+	// Disable color in tests (see https://charm.sh/blog/teatest/)
+	lipgloss.SetColorProfile(termenv.Ascii)
+}

internal/app/module_list_test.go

@@ -17,7 +17,6 @@ func TestModuleList(t *testing.T) {
 		"modules/c",
 	}
 	waitFor(t, tm, func(s string) bool {
-		t.Log(s)
 		for _, w := range want {
 			if !strings.Contains(s, w) {
 				return false
@@ -52,8 +51,9 @@ func TestModuleList(t *testing.T) {
 	tm.Type("p")
 	// Expect all 3 modules to be in planned state
 	waitFor(t, tm, func(s string) bool {
-		t.Log(s)
-		return matchPattern(t, `(?s)(planned.*)[3]`, s)
+		return matchPattern(t, `modules/a.*default.*planned`, s) &&
+			matchPattern(t, `modules/b.*default.*planned`, s) &&
+			matchPattern(t, `modules/c.*default.*planned`, s)
 	})
 
 	// Select all modules and apply

internal/app/module_test.go

@@ -5,6 +5,7 @@ import (
 	"testing"
 
 	tea "github.com/charmbracelet/bubbletea"
+	"github.com/leg100/pug/internal"
 )
 
 func TestModule(t *testing.T) {
@@ -88,7 +89,6 @@ func TestModule_ReloadWorkspaces(t *testing.T) {
 
 	// Expect message to inform user that reload has finished.
 	waitFor(t, tm, func(s string) bool {
-		t.Log(s)
 		return strings.Contains(s, "completed reload-workspaces task successfully")
 	})
 }
@@ -122,6 +122,7 @@ func TestModule_Destroy(t *testing.T) {
 
 	// Expect umpteen resources to be proposed for deletion
 	waitFor(t, tm, func(s string) bool {
+		s = internal.StripAnsi(s)
 		return strings.Contains(s, "+0~0-10")
 	})
 }

internal/app/workspace_list_test.go

@@ -150,6 +150,9 @@ func TestWorkspaceList_ApplyCurrentRun(t *testing.T) {
 
 	// Expect all four workspaces' current run to enter the applied state
 	waitFor(t, tm, func(s string) bool {
-		return matchPattern(t, `(?s)default.*applied.*dev.*applied.*default.*applied.*default.*applied`, s)
+		return matchPattern(t, `modules/a.*default.*applied`, s) &&
+			matchPattern(t, `modules/a.*dev.*applied`, s) &&
+			matchPattern(t, `modules/b.*default.*applied`, s) &&
+			matchPattern(t, `modules/c.*default.*applied`, s)
 	})
 }

internal/task/task_test.go

@@ -15,7 +15,7 @@ import (
 func TestTask_stdout(t *testing.T) {
 	f := factory{
 		counter:   internal.Int(0),
-		program:   "../testdata/task",
+		program:   "./testdata/task",
 		publisher: &fakePublisher[*Task]{},
 	}
 	task, err := f.newTask(CreateOptions{})
@@ -44,7 +44,7 @@ func TestTask_stdout(t *testing.T) {
 func TestTask_cancel(t *testing.T) {
 	f := factory{
 		counter:   internal.Int(0),
-		program:   "../testdata/killme",
+		program:   "./testdata/killme",
 		publisher: &fakePublisher[*Task]{},
 	}
 	task, err := f.newTask(CreateOptions{})