Skip to content

Commit

Permalink
Fix integration tests
Browse files Browse the repository at this point in the history
  • Loading branch information
Dariquest committed Jan 30, 2025
1 parent b07e028 commit 17b0c06
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion integration/helpers/login.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ func SetAPI() (string, bool) {
apiURL := GetAPI()
skipSSLValidation := SkipSSLValidation()
if skipSSLValidation {
Eventually(CF("api", apiURL, "--skip-ssl-validation")).Should(Exit(0))
Eventually(CF("api", apiURL, "--skip-ssl-validation")).Should(Exit(1))
} else {
Eventually(CF("api", apiURL)).Should(Exit(0))
}
Expand Down
2 changes: 1 addition & 1 deletion integration/v7/isolated/map_route_command_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ var _ = Describe("map-route command", func() {
Eventually(session).Should(Say(`Map an HTTP route:\n`))
Eventually(session).Should(Say(`cf map-route APP_NAME DOMAIN \[--hostname HOSTNAME\] \[--path PATH\] \[--app-protocol PROTOCOL\] \[--option OPTION=VALUE\]\n`))
Eventually(session).Should(Say(`Map a TCP route:\n`))
Eventually(session).Should(Say(`cf map-route APP_NAME DOMAIN \[--port PORT]\n`))
Eventually(session).Should(Say(`cf map-route APP_NAME DOMAIN \[--port PORT] \[--option OPTION=VALUE\]\n`))
Eventually(session).Should(Say(`\n`))

Eventually(session).Should(Say(`EXAMPLES:`))
Expand Down
4 changes: 2 additions & 2 deletions integration/v7/isolated/routes_command_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ 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\n`, spaceName, domainName, appProtocolValue, appName1, serviceInstanceName))
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))
Expand All @@ -145,7 +145,7 @@ 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\n`, spaceName, domainName, appProtocolValue, appName1, serviceInstanceName))
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))
})
})
Expand Down
10 changes: 5 additions & 5 deletions integration/v7/isolated/update_route_command_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -107,16 +107,16 @@ var _ = Describe("update-route command", func() {
option = "loadbalancing=round-robin"
session := helpers.CF("update-route", domainName, "--hostname", hostname, "--option", option)
Eventually(session).Should(Say(`Updating route %s\.%s for org %s / space %s as %s\.\.\.`, hostname, domainName, orgName, spaceName, userName))
Eventually(session).Should(Say(`Route %s\.%s has been updated\.`, hostname, domainName))
Eventually(session).Should(Say(`Route %s\.%s%s has been updated\.`, hostname, domainName, path))
Eventually(session).Should(Say(`OK`))
Eventually(session).Should(Exit(0))
})
})

When("route options are not specified", func() {
It("gives an error message and fails", func() {
session := helpers.CF("update-route", domainName, "--hostname", hostname)
Eventually(session).Should(Say(`No options were specified for the update of the Route %s`, domainName))
session := helpers.CF("update-route", domainName, "--hostname", hostname, "--path", path)
Eventually(session.Err).Should(Say(`Route option support: 'No options were specified for the update of the Route %s\.%s\%s`, hostname, domainName, path))
Eventually(session).Should(Exit(1))
})
})
Expand Down Expand Up @@ -152,7 +152,7 @@ var _ = Describe("update-route command", func() {
session := helpers.CF("update-route", domainName, "--hostname", hostname, "--option", option)
Eventually(session).Should(Say(`Updating route %s\.%s for org %s / space %s as %s\.\.\.`, hostname, domainName, orgName, spaceName, userName))
Eventually(session.Err).Should(Say(`API endpoint not found at`))
Eventually(session).Should(Exit(0))
Eventually(session).Should(Exit(1))
})
})

Expand All @@ -161,7 +161,7 @@ var _ = Describe("update-route command", func() {
When("the domain does not exist", func() {
It("gives an error message and exits", func() {
session := helpers.CF("update-route", "some-domain")
Eventually(session.Err).Should(Say(`Domain %s not found.`, "some-domain"))
Eventually(session.Err).Should(Say(`Domain '%s' not found.`, "some-domain"))
Eventually(session).Should(Exit(0))
})
})
Expand Down

0 comments on commit 17b0c06

Please sign in to comment.