Replace legacy e2e suite with owner-only CLI contract tests

Author: robzolkos

.env.test.example

@@ -0,0 +1,6 @@
+# e2e test credentials template.
+# Copy to .env.test and fill in real tokens (that file is git-excluded).
+
+FIZZY_TEST_TOKEN=fizzy_your_token_here
+FIZZY_TEST_ACCOUNT=1234567
+FIZZY_TEST_API_URL=https://app.fizzy.do

Makefile

@@ -1,9 +1,13 @@
-.PHONY: test test-unit test-e2e test-go test-file test-run build clean tidy help \
+.PHONY: test test-unit test-e2e e2e test-go test-file e2e-file test-run e2e-run build clean tidy help \
 	check-toolchain fmt fmt-check vet lint tidy-check race-test vuln secrets \
 	replace-check security check release-check release tools \
 	surface-snapshot surface-check lint-actions
 
 BINARY := $(CURDIR)/bin/fizzy
+
+# Load local test credentials if present (file is git-excluded via .git/info/exclude).
+-include .env.test
+export FIZZY_TEST_TOKEN FIZZY_TEST_ACCOUNT FIZZY_TEST_API_URL
 VERSION ?= $(shell git describe --tags --always --dirty 2>/dev/null || echo dev)
 LDFLAGS := -X main.version=$(VERSION)
 
@@ -20,10 +24,13 @@ help:
 	@echo "Usage:"
 	@echo "  make build          Build the CLI"
 	@echo "  make test-unit      Run unit tests (no API required)"
-	@echo "  make test-e2e       Run e2e tests (requires API credentials)"
-	@echo "  make test           Alias for test-e2e"
-	@echo "  make test-file      Run a specific e2e test file"
-	@echo "  make test-run       Run a specific e2e test by name"
+	@echo "  make e2e            Run owner-only CLI contract e2e tests"
+	@echo "  make test-e2e       Alias for e2e"
+	@echo "  make test           Alias for e2e"
+	@echo "  make e2e-file       Run a specific CLI contract e2e test file"
+	@echo "  make test-file      Alias for e2e-file"
+	@echo "  make e2e-run        Run a specific CLI contract e2e test by name"
+	@echo "  make test-run       Alias for e2e-run"
 	@echo "  make clean          Remove build artifacts"
 	@echo "  make tidy           Tidy dependencies"
 	@echo ""
@@ -45,17 +52,19 @@ help:
 	@echo "  make tools          Install dev tools"
 	@echo ""
 	@echo "Environment variables (required for e2e tests):"
-	@echo "  FIZZY_TEST_TOKEN   API token"
-	@echo "  FIZZY_TEST_ACCOUNT Account slug"
-	@echo "  FIZZY_TEST_API_URL API base URL (default: https://app.fizzy.do)"
-	@echo "  FIZZY_TEST_USER_ID User ID for user update/deactivate tests (optional)"
+	@echo "  FIZZY_TEST_TOKEN        API token"
+	@echo "  FIZZY_TEST_ACCOUNT      Account slug"
+	@echo "  FIZZY_TEST_API_URL      API base URL (default: https://app.fizzy.do)"
+	@echo "  FIZZY_TEST_BINARY       Prebuilt binary path (optional)"
+	@echo "  FIZZY_E2E_KEEP_FIXTURE  Set to 1 to skip final fixture teardown"
+	@echo "  FIZZY_E2E_TEARDOWN_DELAY  Delay teardown by N seconds"
 	@echo ""
 	@echo "Examples:"
 	@echo "  make build"
 	@echo "  make test-unit"
 	@echo "  export FIZZY_TEST_TOKEN=your-token"
 	@echo "  export FIZZY_TEST_ACCOUNT=your-account"
-	@echo "  make test-e2e"
+	@echo "  make e2e"
 
 # Toolchain guard — fails fast when PATH go and GOROOT go disagree
 check-toolchain:
@@ -80,28 +89,33 @@ test-unit: check-toolchain
 	go test -v ./internal/...
 
 # Run e2e tests (requires API credentials)
-test-e2e: build
+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
-	FIZZY_TEST_BINARY=$(BINARY) go test -v ./e2e/tests/...
+	FIZZY_TEST_BINARY=$(BINARY) go test -v -timeout 10m ./e2e/cli_tests/...
+
+test-e2e: e2e
 
-# Alias for test-e2e
-test: test-e2e
-test-go: test-e2e
+test: e2e
+test-go: e2e
 
-# Run a single test file (e.g., make test-file FILE=board)
-test-file: build
-	@if [ -z "$(FILE)" ]; then echo "Usage: make test-file FILE=board"; exit 1; fi
+# Run a single test file (e.g., make e2e-file FILE=crud_board)
+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
-	FIZZY_TEST_BINARY=$(BINARY) go test -v ./e2e/tests/$(FILE)_test.go
+	FIZZY_TEST_BINARY=$(BINARY) go test -v ./e2e/cli_tests/$(FILE)_test.go
 
-# Run a single test by name (e.g., make test-run NAME=TestBoardCRUD)
-test-run: build
-	@if [ -z "$(NAME)" ]; then echo "Usage: make test-run NAME=TestBoardCRUD"; exit 1; fi
+test-file: e2e-file
+
+# Run a single test by name (e.g., make e2e-run NAME=TestBoardList)
+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
-	FIZZY_TEST_BINARY=$(BINARY) go test -v -run $(NAME) ./e2e/tests/...
+	FIZZY_TEST_BINARY=$(BINARY) go test -v -run $(NAME) ./e2e/cli_tests/...
+
+test-run: e2e-run
 
 # Format Go source
 fmt:

README.md

@@ -188,9 +188,20 @@ fizzy skill install
 ```bash
 make build            # Build binary
 make test-unit        # Run unit tests (no API required)
-make test-e2e         # Run e2e tests (requires FIZZY_TEST_TOKEN, FIZZY_TEST_ACCOUNT)
+make e2e              # Run owner-only CLI contract e2e suite
+make e2e-run NAME=TestBoardList
 ```
 
+E2E requirements:
+- `FIZZY_TEST_TOKEN`
+- `FIZZY_TEST_ACCOUNT`
+- optional: `FIZZY_TEST_API_URL`
+- optional: `FIZZY_TEST_BINARY`
+
+Useful local inspection modes:
+- `FIZZY_E2E_KEEP_FIXTURE=1 make e2e`
+- `FIZZY_E2E_TEARDOWN_DELAY=120 make e2e`
+
 ## License
 
 [MIT](LICENSE)

e2e/cli_tests/account_user_test.go

@@ -0,0 +1,109 @@
+package clitests
+
+import (
+	"strconv"
+	"testing"
+)
+
+func TestAccountShow(t *testing.T) {
+	assertOK(t, newHarness(t).Run("account", "show"))
+}
+
+func TestAccountSettingsUpdateWithCurrentName(t *testing.T) {
+	h := newHarness(t)
+	show := h.Run("account", "show")
+	assertOK(t, show)
+	currentName := show.GetDataString("name")
+	if currentName == "" {
+		t.Skip("account show returned no name")
+	}
+	assertOK(t, h.Run("account", "settings-update", "--name", currentName))
+}
+
+func TestAccountEntropyWithCurrentValue(t *testing.T) {
+	h := newHarness(t)
+	show := h.Run("account", "show")
+	assertOK(t, show)
+	days := show.GetDataInt("auto_postpone_period_in_days")
+	if days == 0 {
+		days = 7
+	}
+	assertOK(t, h.Run("account", "entropy", "--auto_postpone_period_in_days", strconv.Itoa(days)))
+}
+
+func TestAccountJoinCodeShow(t *testing.T) {
+	assertOK(t, newHarness(t).Run("account", "join-code-show"))
+}
+
+func TestAccountExportCreateShow(t *testing.T) {
+	h := newHarness(t)
+	create := h.Run("account", "export-create")
+	assertOK(t, create)
+	exportID := create.GetDataString("id")
+	if exportID == "" {
+		exportID = mapValueString(create.GetDataMap(), "id")
+	}
+	if exportID == "" {
+		t.Fatal("expected export ID in export-create response")
+	}
+	show := h.Run("account", "export-show", exportID)
+	assertOK(t, show)
+	if got := mapValueString(show.GetDataMap(), "id"); got != exportID {
+		t.Fatalf("expected export-show id %q, got %q", exportID, got)
+	}
+	if got := mapValueString(show.GetDataMap(), "status"); got == "" {
+		t.Fatal("expected export status in export-show response")
+	}
+}
+
+func TestUserList(t *testing.T) {
+	result := newHarness(t).Run("user", "list")
+	assertOK(t, result)
+	if result.GetDataArray() == nil {
+		t.Fatal("expected array response")
+	}
+}
+
+func TestUserShowAndUpdateOwnProfile(t *testing.T) {
+	h := newHarness(t)
+	userID := currentUserID(t, h)
+	show := h.Run("user", "show", userID)
+	assertOK(t, show)
+	currentName := show.GetDataString("name")
+	if currentName == "" {
+		t.Skip("user show returned no name")
+	}
+	assertOK(t, h.Run("user", "update", userID, "--name", currentName))
+}
+
+func TestUserAvatarUpdateAndRemove(t *testing.T) {
+	h := newHarness(t)
+	userID := currentUserID(t, h)
+	fixturePath := fixtureFile(t, "test_image.png")
+
+	show := h.Run("user", "show", userID)
+	assertOK(t, show)
+	avatarURL := show.GetDataString("avatar_url")
+	if avatarURL == "" {
+		t.Skip("user show returned no avatar_url")
+	}
+	initiallyAttached := avatarRedirects(t, avatarURL)
+	if initiallyAttached {
+		t.Cleanup(func() {
+			assertOK(t, newHarness(t).Run("user", "update", userID, "--avatar", fixturePath))
+			if !avatarRedirects(t, avatarURL) {
+				t.Fatal("expected avatar to be restored")
+			}
+		})
+	}
+
+	assertOK(t, h.Run("user", "update", userID, "--avatar", fixturePath))
+	if !avatarRedirects(t, avatarURL) {
+		t.Fatal("expected uploaded avatar endpoint to redirect to an image blob")
+	}
+
+	assertOK(t, h.Run("user", "avatar-remove", userID))
+	if avatarRedirects(t, avatarURL) {
+		t.Fatal("expected avatar endpoint to fall back to generated SVG after removal")
+	}
+}

e2e/cli_tests/crud_board_test.go

@@ -0,0 +1,82 @@
+package clitests
+
+import (
+	"fmt"
+	"testing"
+	"time"
+
+	"github.com/basecamp/fizzy-cli/e2e/harness"
+)
+
+func TestBoardList(t *testing.T) {
+	h := newHarness(t)
+	result := h.Run("board", "list")
+	assertOK(t, result)
+	if result.GetDataArray() == nil {
+		t.Fatal("expected array response")
+	}
+}
+
+func TestBoardListAll(t *testing.T) {
+	assertOK(t, newHarness(t).Run("board", "list", "--all"))
+}
+
+func TestBoardListPaginated(t *testing.T) {
+	assertOK(t, newHarness(t).Run("board", "list", "--page", "1"))
+}
+
+func TestBoardShow(t *testing.T) {
+	result := newHarness(t).Run("board", "show", fixture.BoardID)
+	assertOK(t, result)
+	if got := result.GetDataString("id"); got != fixture.BoardID {
+		t.Fatalf("expected board id %q, got %q", fixture.BoardID, got)
+	}
+}
+
+func TestBoardShowNotFound(t *testing.T) {
+	assertResult(t, newHarness(t).Run("board", "show", "nonexistent-board-id-99999"), harness.ExitNotFound)
+}
+
+func TestBoardCreateUpdateDelete(t *testing.T) {
+	h := newHarness(t)
+	boardID := createBoard(t, h)
+	result := h.Run("board", "update", boardID, "--name", fmt.Sprintf("Updated Board %d", time.Now().UnixNano()))
+	assertOK(t, result)
+
+	deleteResult := h.Run("board", "delete", boardID)
+	assertOK(t, deleteResult)
+	if !deleteResult.GetDataBool("deleted") {
+		t.Fatal("expected deleted=true")
+	}
+}
+
+func TestBoardPublishUnpublish(t *testing.T) {
+	h := newHarness(t)
+	boardID := createBoard(t, h)
+	publish := h.Run("board", "publish", boardID)
+	assertOK(t, publish)
+	if publish.GetDataString("public_url") == "" {
+		t.Fatal("expected public_url in publish response")
+	}
+	assertOK(t, h.Run("board", "unpublish", boardID))
+}
+
+func TestBoardEntropy(t *testing.T) {
+	h := newHarness(t)
+	boardID := createBoard(t, h)
+	assertOK(t, h.Run("board", "entropy", boardID, "--auto_postpone_period_in_days", "7"))
+}
+
+func TestBoardViews(t *testing.T) {
+	h := newHarness(t)
+	assertOK(t, h.Run("board", "closed", "--board", fixture.BoardID))
+	assertOK(t, h.Run("board", "postponed", "--board", fixture.BoardID))
+	assertOK(t, h.Run("board", "stream", "--board", fixture.BoardID))
+}
+
+func TestBoardInvolvement(t *testing.T) {
+	h := newHarness(t)
+	boardID := createBoard(t, h)
+	assertOK(t, h.Run("board", "involvement", boardID, "--involvement", "watching"))
+	assertOK(t, h.Run("board", "involvement", boardID, "--involvement", "access_only"))
+}