Fix remaining e2e review feedback

Author: robzolkos

Makefile

@@ -96,7 +96,7 @@ test-unit: check-toolchain
 e2e: build
 	@if [ -z "$$FIZZY_TEST_TOKEN" ]; then echo "Error: FIZZY_TEST_TOKEN not set"; exit 1; fi
 	@if [ -z "$$FIZZY_TEST_ACCOUNT" ]; then echo "Error: FIZZY_TEST_ACCOUNT not set"; exit 1; fi
-	go test -v -timeout 10m ./e2e/cli_tests/...
+	go test -v -count=1 -timeout 10m ./e2e/cli_tests/...
 
 test-e2e: e2e
 
@@ -108,7 +108,7 @@ e2e-file: build
 	@if [ -z "$(FILE)" ]; then echo "Usage: make e2e-file FILE=crud_board"; exit 1; fi
 	@if [ -z "$$FIZZY_TEST_TOKEN" ]; then echo "Error: FIZZY_TEST_TOKEN not set"; exit 1; fi
 	@if [ -z "$$FIZZY_TEST_ACCOUNT" ]; then echo "Error: FIZZY_TEST_ACCOUNT not set"; exit 1; fi
-	go test -v ./e2e/cli_tests/$(FILE)_test.go
+	go test -v -count=1 ./e2e/cli_tests/$(FILE)_test.go
 
 test-file: e2e-file
 
@@ -117,7 +117,7 @@ e2e-run: build
 	@if [ -z "$(NAME)" ]; then echo "Usage: make e2e-run NAME=TestBoardList"; exit 1; fi
 	@if [ -z "$$FIZZY_TEST_TOKEN" ]; then echo "Error: FIZZY_TEST_TOKEN not set"; exit 1; fi
 	@if [ -z "$$FIZZY_TEST_ACCOUNT" ]; then echo "Error: FIZZY_TEST_ACCOUNT not set"; exit 1; fi
-	go test -v -run $(NAME) ./e2e/cli_tests/...
+	go test -v -count=1 -run $(NAME) ./e2e/cli_tests/...
 
 test-run: e2e-run
 

e2e/cli_tests/main_test.go

@@ -28,42 +28,45 @@ var (
 )
 
 func TestMain(m *testing.M) {
+	os.Exit(runMain(m))
+}
+
+func runMain(m *testing.M) int {
 	cfg = harness.LoadConfig()
 	if missing := cfg.MissingVars(); len(missing) > 0 {
 		fmt.Fprintf(os.Stderr, "Skipping CLI e2e tests — missing env vars: %v\n", missing)
 		fmt.Fprintln(os.Stderr, "Set FIZZY_TEST_TOKEN and FIZZY_TEST_ACCOUNT to run these tests.")
-		os.Exit(0)
+		return 0
 	}
 
 	if !fileExists(cfg.BinaryPath) {
 		repoRoot, err := harness.RepoRoot()
 		if err != nil {
 			fmt.Fprintln(os.Stderr, err.Error())
-			os.Exit(1)
+			return 1
 		}
 		tmpDir, err := os.MkdirTemp("", "fizzy-e2e-cli-build-*")
 		if err != nil {
 			fmt.Fprintln(os.Stderr, err.Error())
-			os.Exit(1)
+			return 1
 		}
+		defer os.RemoveAll(tmpDir)
 		binPath := filepath.Join(tmpDir, "fizzy")
 		cmd := exec.Command("go", "build", "-o", binPath, "./cmd/fizzy")
 		cmd.Dir = repoRoot
 		if out, err := cmd.CombinedOutput(); err != nil {
-			_ = os.RemoveAll(tmpDir)
 			fmt.Fprintf(os.Stderr, "failed to build binary: %v\n%s\n", err, string(out))
-			os.Exit(1)
+			return 1
 		}
 		_ = os.Setenv("FIZZY_TEST_BINARY", binPath)
 		cfg.BinaryPath = binPath
-		defer os.RemoveAll(tmpDir)
 	}
 
 	var err error
 	fixture, err = harness.NewSharedFixture(cfg)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "fixture setup failed: %v\n", err)
-		os.Exit(1)
+		return 1
 	}
 	printFixtureInfo()
 
@@ -72,7 +75,7 @@ func TestMain(m *testing.M) {
 	if os.Getenv("FIZZY_E2E_KEEP_FIXTURE") == "1" {
 		fmt.Fprintln(os.Stderr, "Keeping CLI e2e fixture (FIZZY_E2E_KEEP_FIXTURE=1)")
 		printFixtureInfo()
-		os.Exit(code)
+		return code
 	}
 	if delay := teardownDelay(); delay > 0 {
 		fmt.Fprintf(os.Stderr, "Delaying CLI e2e fixture teardown for %s\n", delay)
@@ -82,7 +85,7 @@ func TestMain(m *testing.M) {
 	if err := fixture.Teardown(); err != nil {
 		fmt.Fprintf(os.Stderr, "warning: fixture teardown error: %v\n", err)
 	}
-	os.Exit(code)
+	return code
 }
 
 func printFixtureInfo() {

e2e/cli_tests/search_and_auth_test.go

@@ -24,5 +24,8 @@ func TestAuthMissingToken(t *testing.T) {
 	missingCfg := *cfg
 	missingCfg.Token = ""
 	h := harness.NewWithConfig(t, &missingCfg)
-	assertResult(t, h.Run("board", "list"), harness.ExitAuthFailure)
+	assertResult(t, h.RunWithEnv(map[string]string{
+		"FIZZY_TOKEN":   "",
+		"FIZZY_ACCOUNT": "",
+	}, "board", "list"), harness.ExitAuthFailure)
 }

e2e/harness/harness.go

@@ -247,9 +247,9 @@ func (h *Harness) RunWithoutAuth(args ...string) *Result {
 
 // buildArgs builds the full argument list with global options.
 func (h *Harness) buildArgs(args ...string) []string {
-	globalArgs := []string{
-		"--token", h.Token,
-		"--api-url", h.APIURL,
+	globalArgs := []string{"--api-url", h.APIURL}
+	if h.Token != "" {
+		globalArgs = append(globalArgs, "--token", h.Token)
 	}
 	// Append global args after the command args
 	return append(args, globalArgs...)
@@ -260,8 +260,13 @@ func (h *Harness) buildArgs(args ...string) []string {
 func (h *Harness) globalEnv() map[string]string {
 	return map[string]string{
 		"FIZZY_PROFILE":    h.Account,
+		"FIZZY_ACCOUNT":    "",
+		"FIZZY_TOKEN":      "",
 		"FIZZY_NO_KEYRING": "1",
 		"HOME":             h.configHome,
+		"XDG_CONFIG_HOME":  filepath.Join(h.configHome, "config"),
+		"XDG_DATA_HOME":    filepath.Join(h.configHome, "data"),
+		"XDG_STATE_HOME":   filepath.Join(h.configHome, "state"),
 	}
 }
 

e2e/harness/runner.go

@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"os"
 	"os/exec"
+	"strings"
 	"syscall"
 )
 
@@ -17,7 +18,23 @@ func Execute(binaryPath string, args []string, env map[string]string) *Result {
 	cmd.Stderr = &stderr
 
 	// Set up environment
-	cmd.Env = os.Environ()
+	baseEnv := os.Environ()
+	if len(env) > 0 {
+		overrides := make(map[string]struct{}, len(env))
+		for k := range env {
+			overrides[k] = struct{}{}
+		}
+		filtered := baseEnv[:0]
+		for _, entry := range baseEnv {
+			key, _, _ := strings.Cut(entry, "=")
+			if _, ok := overrides[key]; ok {
+				continue
+			}
+			filtered = append(filtered, entry)
+		}
+		baseEnv = filtered
+	}
+	cmd.Env = append([]string(nil), baseEnv...)
 	for k, v := range env {
 		cmd.Env = append(cmd.Env, k+"="+v)
 	}