PR feedback

Author: rocktavious

src/e2e/domain_test.go

@@ -6,50 +6,45 @@ import (
 )
 
 func TestDomainHappyPath(t *testing.T) {
-	createInput := `
+	test := CLITest{
+		Create: Create("create domain -f -", `
 name: "Integration Test Domain"
 description: "Created by integration test"
-`
-	updateInput1 := `
-name: "Integration Test Domain Updated"
-description: "Updated by integration test"
-`
-	updateInput2 := `
-name: "Integration Test Domain Updated Again"
-description: null
-`
-	domainName := "Integration Test Domain"
-	updatedDomainName := "Integration Test Domain Updated"
-	updatedAgainDomainName := "Integration Test Domain Updated Again"
-
-	test := CLITest{
-		Create: Create("create domain -f -", createInput),
+`),
 		Get:    Get("get domain"),
 		Delete: Delete("delete domain"),
 		Steps: []Step{
 			func(u *Utility) {
 				out, err := u.Run("list domain")
-				if err != nil || !strings.Contains(out, domainName) {
+				if err != nil || !strings.Contains(out, "Integration Test Domain") {
 					u.Fatalf("list failed: %v\nout: %s", err, out)
 				}
 			},
 			func(u *Utility) {
+				updateInput1 := `
+name: "Integration Test Domain Updated"
+description: "Updated by integration test"
+`
 				out, err := u.Run("update domain "+u.ID+" -f -", updateInput1)
 				if err != nil {
 					u.Fatalf("update1 failed: %v\nout: %s", err, out)
 				}
 				out, err = u.Run("get domain " + u.ID)
-				if err != nil || !strings.Contains(out, updatedDomainName) || !strings.Contains(out, "Updated by integration test") {
+				if err != nil || !strings.Contains(out, "Integration Test Domain Updated") || !strings.Contains(out, "Updated by integration test") {
 					u.Fatalf("get after update1 failed: %v\nout: %s", err, out)
 				}
 			},
 			func(u *Utility) {
+				updateInput2 := `
+name: "Integration Test Domain Updated Again"
+description: null
+`
 				out, err := u.Run("update domain "+u.ID+" -f -", updateInput2)
 				if err != nil {
 					u.Fatalf("update2 (unset) failed: %v\nout: %s", err, out)
 				}
 				out, err = u.Run("get domain " + u.ID)
-				if err != nil || !strings.Contains(out, updatedAgainDomainName) || strings.Contains(out, "Updated by integration test") {
+				if err != nil || !strings.Contains(out, "Integration Test Domain Updated Again") || strings.Contains(out, "Updated by integration test") {
 					u.Fatalf("get after update2 failed (description should be unset): %v\nout: %s", err, out)
 				}
 			},

src/e2e/helpers.go

@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"os"
 	"os/exec"
+	"strconv"
 	"strings"
 	"testing"
 )
@@ -40,21 +41,32 @@ type CLITest struct {
 
 func (ct *CLITest) Run(t *testing.T) {
 	util := &Utility{T: t}
-
 	defer func() {
 		if util.ID != "" {
 			ct.Delete(util)
 		}
 	}()
 
-	ct.Create(util)
-	ct.Get[0](util) // Should exist after create
-	for _, step := range ct.Steps {
-		step(util)
+	t.Run("Create", func(t *testing.T) {
+		util.T = t
+		ct.Create(util)
+	})
+	t.Run("Get", func(t *testing.T) {
+		util.T = t
+		ct.Get[0](util) // Should exist after create
+	})
+	for i, step := range ct.Steps {
+		t.Run("Step "+strconv.Itoa(i), func(t *testing.T) {
+			util.T = t
+			step(util)
+		})
 	}
-	ct.Delete(util)
-	ct.Get[1](util) // Should not exist after delete
-	util.ID = ""    // Mark as deleted so defer doesn't try again
+	t.Run("Delete", func(t *testing.T) {
+		util.T = t
+		ct.Delete(util)
+		ct.Get[1](util) // Should not exist after delete
+		util.ID = ""    // Mark as deleted so defer doesn't try again
+	})
 }
 
 func Create(cmd string, input string) Step {
@@ -79,7 +91,7 @@ func Get(cmd string) [2]Step {
 	}, func(u *Utility) {
 		out, err := u.Run(cmd + " " + u.ID)
 		lower := strings.ToLower(out)
-		if err == nil || !(strings.Contains(lower, "not found") || strings.Contains(lower, "missing") || strings.Contains(lower, "gone")) {
+		if err == nil || !(strings.Contains(lower, "not found") || strings.Contains(lower, "missing") || strings.Contains(lower, "does not exist on this account")) {
 			u.Fatalf("expected get after delete to fail with not found, got: %v\nout: %s", err, out)
 		}
 	}}