Fix final e2e review issues

Author: robzolkos

e2e/cli_tests/crud_subresources_test.go

@@ -105,19 +105,23 @@ func TestStepCRUD(t *testing.T) {
 
 func TestReactionCRUD(t *testing.T) {
 	h := newHarness(t)
+	userID := currentUserID(t, h)
 	cardStr := strconv.Itoa(fixture.CardNumber)
+	cardReactionContent := "+1"
+	commentReactionContent := "heart"
+
 	cardReactionsBefore := h.Run("reaction", "list", "--card", cardStr)
 	assertOK(t, cardReactionsBefore)
 	commentReactionsBefore := h.Run("reaction", "list", "--card", cardStr, "--comment", fixture.CommentID)
 	assertOK(t, commentReactionsBefore)
 
-	cardReaction := h.Run("reaction", "create", "--card", cardStr, "--content", "+1")
+	cardReaction := h.Run("reaction", "create", "--card", cardStr, "--content", cardReactionContent)
 	assertOK(t, cardReaction)
 	cardReactions := h.Run("reaction", "list", "--card", cardStr)
 	assertOK(t, cardReactions)
-	cardReactionID := listAddedID(cardReactionsBefore.GetDataArray(), cardReactions.GetDataArray())
+	cardReactionID := addedReactionID(cardReactionsBefore.GetDataArray(), cardReactions.GetDataArray(), cardReactionContent, userID)
 	if cardReactionID == "" {
-		t.Fatal("expected created card reaction to appear in list")
+		t.Fatal("expected exactly one created card reaction for the current user to appear in list")
 	}
 	t.Cleanup(func() {
 		if cardReactionID != "" {
@@ -136,13 +140,13 @@ func TestReactionCRUD(t *testing.T) {
 		t.Fatalf("expected deleted card reaction %q to be absent from list", deletedCardReactionID)
 	}
 
-	commentReaction := h.Run("reaction", "create", "--card", cardStr, "--comment", fixture.CommentID, "--content", "heart")
+	commentReaction := h.Run("reaction", "create", "--card", cardStr, "--comment", fixture.CommentID, "--content", commentReactionContent)
 	assertOK(t, commentReaction)
 	commentReactions := h.Run("reaction", "list", "--card", cardStr, "--comment", fixture.CommentID)
 	assertOK(t, commentReactions)
-	commentReactionID := listAddedID(commentReactionsBefore.GetDataArray(), commentReactions.GetDataArray())
+	commentReactionID := addedReactionID(commentReactionsBefore.GetDataArray(), commentReactions.GetDataArray(), commentReactionContent, userID)
 	if commentReactionID == "" {
-		t.Fatal("expected created comment reaction to appear in list")
+		t.Fatal("expected exactly one created comment reaction for the current user to appear in list")
 	}
 	t.Cleanup(func() {
 		if commentReactionID != "" {

e2e/cli_tests/helpers_test.go

@@ -216,6 +216,46 @@ func listAddedID(before, after []any) string {
 	return ""
 }
 
+func addedReactionID(before, after []any, content, userID string) string {
+	seen := make(map[string]struct{}, len(before))
+	for _, item := range before {
+		m := asMap(item)
+		if m == nil {
+			continue
+		}
+		if id := mapValueString(m, "id"); id != "" {
+			seen[id] = struct{}{}
+		}
+	}
+
+	matches := []string{}
+	for _, item := range after {
+		m := asMap(item)
+		if m == nil {
+			continue
+		}
+		id := mapValueString(m, "id")
+		if id == "" {
+			continue
+		}
+		if _, ok := seen[id]; ok {
+			continue
+		}
+		if mapValueString(m, "content") != content {
+			continue
+		}
+		reacter := asMap(m["reacter"])
+		if userID != "" && mapValueString(reacter, "id") != userID {
+			continue
+		}
+		matches = append(matches, id)
+	}
+	if len(matches) == 1 {
+		return matches[0]
+	}
+	return ""
+}
+
 func bodyPlainText(m map[string]any) string {
 	if m == nil {
 		return ""

e2e/harness/fixture.go

@@ -43,6 +43,7 @@ func NewSharedFixture(cfg *Config) (*SharedFixture, error) {
 	f := &SharedFixture{cfg: cfg, configHome: tmpDir}
 	if err := f.setup(); err != nil {
 		if teardownErr := f.Teardown(); teardownErr != nil {
+			_ = os.RemoveAll(tmpDir)
 			return nil, fmt.Errorf("%w\ncleanup: %v", err, teardownErr)
 		}
 		return nil, err