Improving helper function

cloudfoundry · Nov 22, 2021 · 3deb205 · 3deb205
1 parent a85cf4a
commit 3deb205
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/integration/helpers/version.go b/integration/helpers/version.go
@@ -87,11 +87,11 @@ func SkipIfUAAVersionAtLeast(version string) {
 }
 
 func matchMajorAPIVersion(minVersion string) string {
-	version := GetAPIVersionV2()
 	if strings.HasPrefix(minVersion, "3") {
-		version = getAPIVersionV3()
+		return getAPIVersionV3()
+	} else {
+		return GetAPIVersionV2()
 	}
-	return version
 }
 
 // GetAPIVersionV2 returns the V2 api version of the targeted API

diff --git a/integration/v7/isolated/routes_command_test.go b/integration/v7/isolated/routes_command_test.go
@@ -15,12 +15,8 @@ import (
 
 var _ = Describe("routes command", func() {
 
-	const tableHeaders = `space\s+host\s+domain\s+port\s+path\s+protocol\s+app-protocol\s+apps\s+service instance`
 	appProtocolValue := "http1"
-	if !helpers.IsVersionMet(ccversion.MinVersionHTTP2RoutingV3) {
-		appProtocolValue = ""
-	}
-
+	const tableHeaders = `space\s+host\s+domain\s+port\s+path\s+protocol\s+app-protocol\s+apps\s+service instance`
 	Context("Help", func() {
 		It("appears in cf help -a", func() {
 			session := helpers.CF("help", "-a")
@@ -70,6 +66,10 @@ var _ = Describe("routes command", func() {
 
 			helpers.SetupCF(orgName, spaceName)
 			userName, _ = helpers.GetCredentials()
+			if !helpers.IsVersionMet(ccversion.MinVersionHTTP2RoutingV3) {
+				appProtocolValue = ""
+			}
+
 		})
 
 		AfterEach(func() {