fix for int test: add new column to checks

Author: mauricebrinkmann

integration/v7/isolated/routes_command_test.go

@@ -122,21 +122,21 @@ var _ = Describe("routes command", func() {
 				Eventually(session).Should(Exit(0))
 				Expect(session).To(Say(`Getting routes for org %s / space %s as %s\.\.\.`, orgName, spaceName, userName))
 				Expect(session).To(Say(tableHeaders))
-				Expect(session).To(Say(`%s\s+route1\s+%s\s+http\s+%s\s+%s\s+%s\s+\n`, spaceName, domainName, appProtocolValue, appName1, serviceInstanceName))
-				Expect(session).To(Say(`%s\s+route1a\s+%s\s+http\s+%s\s+%s\s+\n`, spaceName, domainName, appProtocolValue, appName1))
-				Expect(session).To(Say(`%s\s+route1b\s+%s\s+http\s+%s\s+%s\s+\n`, spaceName, domainName, appProtocolValue, appName1))
-				Expect(session).ToNot(Say(`%s\s+route2\s+%s\s+http\s+%s\s+%s\s+\n`, spaceName, domainName, appProtocolValue, appName2))
+				Expect(session).To(Say(`%s\s+route1\s+%s\s+http\s+%s\s+[0-9]+\s+%s\s+%s\s+\n`, spaceName, domainName, appProtocolValue, appName1, serviceInstanceName))
+				Expect(session).To(Say(`%s\s+route1a\s+%s\s+http\s+%s\s+[0-9]+\s+%s\s+\n`, spaceName, domainName, appProtocolValue, appName1))
+				Expect(session).To(Say(`%s\s+route1b\s+%s\s+http\s+%s\s+[0-9]+\s+%s\s+\n`, spaceName, domainName, appProtocolValue, appName1))
+				Expect(session).ToNot(Say(`%s\s+route2\s+%s\s+http\s+%s\s+[0-9]+\s+%s\s+\n`, spaceName, domainName, appProtocolValue, appName2))
 			})
 
 			It("lists all the routes by label", func() {
 				session := helpers.CF("routes", "--labels", "env in (prod)")
 				Eventually(session).Should(Exit(0))
 				Expect(session).To(Say(`Getting routes for org %s / space %s as %s\.\.\.`, orgName, spaceName, userName))
 				Expect(session).To(Say(tableHeaders))
-				Expect(session).ToNot(Say(`%s\s+route1\s+%s\s+http\s+%s\s+%s\s+%s\n`, spaceName, domainName, appProtocolValue, appName1, serviceInstanceName))
-				Expect(session).ToNot(Say(`%s\s+route1a\s+%s\s+http\s+%s\s+%s\s+\n`, spaceName, domainName, appProtocolValue, appName1))
-				Expect(session).To(Say(`%s\s+route1b\s+%s\s+http\s+%s\s+%s\s+\n`, spaceName, domainName, appProtocolValue, appName1))
-				Expect(session).ToNot(Say(`%s\s+route2\s+%s\s+http\s+%s\s+%s\s+\n`, spaceName, domainName, appProtocolValue, appName2))
+				Expect(session).ToNot(Say(`%s\s+route1\s+%s\s+http\s+%s\s+[0-9]+\s+%s\s+%s\n`, spaceName, domainName, appProtocolValue, appName1, serviceInstanceName))
+				Expect(session).ToNot(Say(`%s\s+route1a\s+%s\s+http\s+%s\s+[0-9]+\s+%s\s+\n`, spaceName, domainName, appProtocolValue, appName1))
+				Expect(session).To(Say(`%s\s+route1b\s+%s\s+http\s+%s\s+[0-9]+\s+s\s+\n`, spaceName, domainName, appProtocolValue, appName1))
+				Expect(session).ToNot(Say(`%s\s+route2\s+%s\s+http\s+%s\s+[0-9]+\s+%s\s+\n`, spaceName, domainName, appProtocolValue, appName2))
 			})
 
 			When("fetching routes by org", func() {
@@ -145,8 +145,8 @@ var _ = Describe("routes command", func() {
 					Eventually(session).Should(Exit(0))
 					Expect(session).To(Say(`Getting routes for org %s as %s\.\.\.`, orgName, userName))
 					Expect(session).To(Say(tableHeaders))
-					Expect(session).To(Say(`%s\s+route1\s+%s\s+http\s+%s\s+%s\s+%s\s+\n`, spaceName, domainName, appProtocolValue, appName1, serviceInstanceName))
-					Expect(session).To(Say(`%s\s+route2\s+%s\s+\/dodo\s+http\s+%s\s+%s\s+\n`, otherSpaceName, domainName, appProtocolValue, appName2))
+					Expect(session).To(Say(`%s\s+route1\s+%s\s+http\s+%s\s+[0-9]+\s+%s\s+%s\s+\n`, spaceName, domainName, appProtocolValue, appName1, serviceInstanceName))
+					Expect(session).To(Say(`%s\s+route2\s+%s\s+\/dodo\s+http\s+%s\s+[0-9]+\s+%s\s+\n`, otherSpaceName, domainName, appProtocolValue, appName2))
 				})
 			})
 		})
@@ -186,8 +186,8 @@ var _ = Describe("routes command", func() {
 				Eventually(session).Should(Exit(0))
 				Expect(session).To(Say(`Getting routes for org %s / space %s as %s\.\.\.`, orgName, spaceName, userName))
 				Expect(session).To(Say(tableHeaders))
-				Eventually(session).Should(Or(Say(`%s\s+route1\s+%s\s+http\s+http1, http2\s+%s\s+\n`, spaceName, domainName, fmt.Sprintf("%s, %s", appName2, appName1)), Say(`%s\s+route1\s+%s\s+http\s+http1, http2\s+%s\s+\n`, spaceName, domainName, fmt.Sprintf("%s, %s", appName1, appName2))))
-				Eventually(session).Should(Say(`%s\s+route2\s+%s\s+http\s+http1\s+%s\s+\n`, spaceName, domainName, appName2))
+				Eventually(session).Should(Or(Say(`%s\s+route1\s+%s\s+http\s+http1, http2\s+[0-9]+\s+%s\s+\n`, spaceName, domainName, fmt.Sprintf("%s, %s", appName2, appName1)), Say(`%s\s+route1\s+%s\s+http\s+http1, http2\s+[0-9]+\s+%s\s+\n`, spaceName, domainName, fmt.Sprintf("%s, %s", appName1, appName2))))
+				Eventually(session).Should(Say(`%s\s+route2\s+%s\s+http\s+http1\s+[0-9]+\s+%s\s+\n`, spaceName, domainName, appName2))
 			})
 		})