Fix other integration tests

Signed-off-by: João Pereira <joaod@vmware.com>

integration/v7/isolated/restage_command_test.go

@@ -31,9 +31,9 @@ var _ = Describe("restage command", func() {
 				Eventually(session).Should(Say("ALIAS:"))
 				Eventually(session).Should(Say("rg"))
 				Eventually(session).Should(Say("OPTIONS:"))
-				Eventually(session).Should(Say(`--strategy\s+Deployment strategy can be canary, rolling or null`))
 				Eventually(session).Should(Say("--max-in-flight"))
-				Eventually(session).Should(Say("--no-wait       Exit when the first instance of the web process is healthy"))
+				Eventually(session).Should(Say(`--strategy\s+Deployment strategy can be canary, rolling or null`))
+				Eventually(session).Should(Say(`--no-wait\s+Exit when the first instance of the web process is healthy`))
 				Eventually(session).Should(Say("ENVIRONMENT:"))
 				Eventually(session).Should(Say(`CF_STAGING_TIMEOUT=15\s+Max wait time for staging, in minutes`))
 				Eventually(session).Should(Say(`CF_STARTUP_TIMEOUT=5\s+Max wait time for app instance startup, in minutes`))

integration/v7/isolated/restart_command_test.go

@@ -51,9 +51,9 @@ var _ = Describe("restart command", func() {
 				Eventually(session).Should(Say("ALIAS:"))
 				Eventually(session).Should(Say("rs"))
 				Eventually(session).Should(Say("OPTIONS:"))
+				Eventually(session).Should(Say("--max-in-flight"))
 				Eventually(session).Should(Say(`--strategy\s+Deployment strategy can be canary, rolling or null.`))
 				Eventually(session).Should(Say(`--no-wait\s+Exit when the first instance of the web process is healthy`))
-				Eventually(session).Should(Say("--max-in-flight"))
 				Eventually(session).Should(Say("ENVIRONMENT:"))
 				Eventually(session).Should(Say(`CF_STAGING_TIMEOUT=15\s+Max wait time for staging, in minutes`))
 				Eventually(session).Should(Say(`CF_STARTUP_TIMEOUT=5\s+Max wait time for app instance startup, in minutes`))

integration/v7/isolated/rollback_command_test.go

@@ -34,8 +34,8 @@ var _ = Describe("rollback command", func() {
 				Expect(session).To(Say("USAGE:"))
 				Expect(session).To(Say(`cf rollback APP_NAME \[--version VERSION\]`))
 				Expect(session).To(Say("OPTIONS:"))
-				Expect(session).To(Say("-f             Force rollback without confirmation"))
-				Expect(session).To(Say("--version      Roll back to the specified revision"))
+				Expect(session).To(Say(`-f\s+Force rollback without confirmation`))
+				Expect(session).To(Say(`--version\s+Roll back to the specified revision`))
 				Expect(session).To(Say("--max-in-flight"))
 				Expect(session).To(Say("SEE ALSO:"))
 				Expect(session).To(Say("revisions"))