Update stack and stacks integration test expectations for state support

Co-authored-by: Cursor <cursoragent@cursor.com>

Author: simonjjones

integration/v7/isolated/stack_command_test.go

@@ -33,7 +33,7 @@ var _ = Describe("stack command", func() {
 			It("appears in cf help -a", func() {
 				session := helpers.CF("help", "-a")
 				Eventually(session).Should(Exit(0))
-				Expect(session).To(HaveCommandInCategoryWithDescription("stack", "APPS", "Show information for a stack (a stack is a pre-built file system, including an operating system, that can run apps)"))
+				Expect(session).To(HaveCommandInCategoryWithDescription("stack", "APPS", "Show information for a stack (a stack is a pre-built file system, including an operating system, that can run apps) and current state"))
 			})
 
 			It("Displays command usage to output", func() {
@@ -100,71 +100,42 @@ var _ = Describe("stack command", func() {
 			})
 		})
 
-		When("the stack exists", func() {
+		When("the stack exists with valid state", func() {
 			var stackGUID string
 
-			Context("when the stack has no state", func() {
-				BeforeEach(func() {
-					jsonBody := fmt.Sprintf(`{"name": "%s", "description": "%s"}`, stackName, stackDescription)
-					session := helpers.CF("curl", "-d", jsonBody, "-X", "POST", "/v3/stacks")
-					Eventually(session).Should(Exit(0))
-
-					r := regexp.MustCompile(`[a-z0-9]{8}-[a-z0-9]{4}-[a-z0-9]{4}-[a-z0-9]{4}-[a-z0-9]{12}`)
-					stackGUID = string(r.Find(session.Out.Contents()))
-				})
-
-				AfterEach(func() {
-					session := helpers.CF("curl", "-X", "DELETE", fmt.Sprintf("/v3/stacks/%s", stackGUID))
-					Eventually(session).Should(Exit(0))
-				})
-
-				It("Shows the details for the stack without state", func() {
-					session := helpers.CF("stack", stackName)
+			BeforeEach(func() {
+				jsonBody := fmt.Sprintf(`{"name": "%s", "description": "%s", "state": "ACTIVE"}`, stackName, stackDescription)
+				session := helpers.CF("curl", "-d", jsonBody, "-X", "POST", "/v3/stacks")
+				Eventually(session).Should(Exit(0))
 
-					Eventually(session).Should(Say(`Getting info for stack %s as %s\.\.\.`, stackName, username))
-					Eventually(session).Should(Say(`name:\s+%s`, stackName))
-					Eventually(session).Should(Say(`description:\s+%s`, stackDescription))
-					Consistently(session).ShouldNot(Say(`state:`))
-					Eventually(session).Should(Exit(0))
-				})
+				r := regexp.MustCompile(`[a-z0-9]{8}-[a-z0-9]{4}-[a-z0-9]{4}-[a-z0-9]{4}-[a-z0-9]{12}`)
+				stackGUID = string(r.Find(session.Out.Contents()))
 			})
 
-			Context("when the stack has a valid state", func() {
-				BeforeEach(func() {
-					jsonBody := fmt.Sprintf(`{"name": "%s", "description": "%s", "state": "ACTIVE"}`, stackName, stackDescription)
-					session := helpers.CF("curl", "-d", jsonBody, "-X", "POST", "/v3/stacks")
-					Eventually(session).Should(Exit(0))
-
-					r := regexp.MustCompile(`[a-z0-9]{8}-[a-z0-9]{4}-[a-z0-9]{4}-[a-z0-9]{4}-[a-z0-9]{12}`)
-					stackGUID = string(r.Find(session.Out.Contents()))
-				})
-
-				AfterEach(func() {
-					session := helpers.CF("curl", "-X", "DELETE", fmt.Sprintf("/v3/stacks/%s", stackGUID))
-					Eventually(session).Should(Exit(0))
-				})
+			AfterEach(func() {
+				session := helpers.CF("curl", "-X", "DELETE", fmt.Sprintf("/v3/stacks/%s", stackGUID))
+				Eventually(session).Should(Exit(0))
+			})
 
-				It("Shows the details for the stack with state", func() {
-					session := helpers.CF("stack", stackName)
+			It("Shows the details for the stack with state", func() {
+				session := helpers.CF("stack", stackName)
 
-					Eventually(session).Should(Say(`Getting info for stack %s as %s\.\.\.`, stackName, username))
-					Eventually(session).Should(Say(`name:\s+%s`, stackName))
-					Eventually(session).Should(Say(`description:\s+%s`, stackDescription))
-					Eventually(session).Should(Say(`state:\s+ACTIVE`))
-					Eventually(session).Should(Exit(0))
-				})
+				Eventually(session).Should(Say(`Getting info for stack %s as %s\.\.\.`, stackName, username))
+				Eventually(session).Should(Say(`name:\s+%s`, stackName))
+				Eventually(session).Should(Say(`description:\s+%s`, stackDescription))
+				Eventually(session).Should(Say(`state:\s+ACTIVE`))
+				Eventually(session).Should(Exit(0))
 			})
 
-			When("the stack exists and the --guid flag is passed", func() {
-				It("prints nothing but the guid", func() {
-					session := helpers.CF("stack", stackName, "--guid")
+			It("prints nothing but the guid when --guid flag is passed", func() {
+				session := helpers.CF("stack", stackName, "--guid")
 
-					Consistently(session).ShouldNot(Say(`Getting info for stack %s as %s\.\.\.`, stackName, username))
-					Consistently(session).ShouldNot(Say(`name:\s+%s`, stackName))
-					Consistently(session).ShouldNot(Say(`description:\s+%s`, stackDescription))
-					Eventually(session).Should(Say(`^[a-z0-9]{8}-[a-z0-9]{4}-[a-z0-9]{4}-[a-z0-9]{4}-[a-z0-9]{12}`))
-					Eventually(session).Should(Exit(0))
-				})
+				Consistently(session).ShouldNot(Say(`Getting info for stack %s as %s\.\.\.`, stackName, username))
+				Consistently(session).ShouldNot(Say(`name:\s+%s`, stackName))
+				Consistently(session).ShouldNot(Say(`description:\s+%s`, stackDescription))
+				Consistently(session).ShouldNot(Say(`state:`))
+				Eventually(session).Should(Say(`^[a-z0-9]{8}-[a-z0-9]{4}-[a-z0-9]{4}-[a-z0-9]{4}-[a-z0-9]{12}`))
+				Eventually(session).Should(Exit(0))
 			})
 		})
 	})

integration/v7/isolated/stacks_command_test.go

@@ -16,7 +16,7 @@ var _ = Describe("stacks command", func() {
 		It("appears in cf help -a", func() {
 			session := helpers.CF("help", "-a")
 			Eventually(session).Should(Exit(0))
-			Expect(session).To(HaveCommandInCategoryWithDescription("stacks", "APPS", "List all stacks (a stack is a pre-built file system, including an operating system, that can run apps)"))
+			Expect(session).To(HaveCommandInCategoryWithDescription("stacks", "APPS", "List all stacks (a stack is a pre-built file system, including an operating system, that can run apps) and current state"))
 		})
 
 		It("Displays command usage to output", func() {
@@ -80,9 +80,9 @@ var _ = Describe("stacks command", func() {
 			Eventually(session).Should(Exit(0))
 
 			Expect(session).Should(Say(`Getting stacks as %s\.\.\.`, userName))
-			Expect(session).Should(Say(`name\s+description`))
-			Expect(session).Should(Say(`cflinuxfs\d+\s+Cloud Foundry Linux`))
-			Expect(session).Should(Say(`%s\s+CF CLI integration test stack, please delete`, stackName))
+			Expect(session).Should(Say(`name\s+description\s+state`))
+			Expect(session).Should(Say(`cflinuxfs\d+\s+Cloud Foundry Linux.*\s+ACTIVE`))
+			Expect(session).Should(Say(`%s\s+CF CLI integration test stack, please delete\s+ACTIVE`, stackName))
 		})
 	})
 })