fix: application 404 expectations (#930)

In case operators are overriding their router's error pages, we should
not check for a specific string. However, the presence of "404" on a 404
error page is probably a safe assumption to make.

Author: ctlong

apps/readiness_healthcheck.go

@@ -69,7 +69,7 @@ var _ = AppsDescribe("Readiness Healthcheck", func() {
 			By("verifying the app is removed from the routing table")
 			Eventually(func() string {
 				return helpers.CurlApp(Config, appName, "/ready")
-			}, readinessHealthCheckTimeout).Should(ContainSubstring("404 Not Found"))
+			}, readinessHealthCheckTimeout).Should(ContainSubstring("404"))
 
 			By("verifying that the app hasn't restarted")
 			Consistently(cf.Cf("events", appName)).ShouldNot(Say("audit.app.process.crash"))

apps/rolling_deploy.go

@@ -58,7 +58,7 @@ var _ = AppsDescribe("Rolling deploys", func() {
 					return
 				case <-tickerChannel:
 					appResponse := helpers.CurlAppRoot(Config, appName)
-					Expect(appResponse).ToNot(ContainSubstring("404 Not Found"))
+					Expect(appResponse).ToNot(ContainSubstring("404"))
 					Expect(appResponse).To(ContainSubstring("Hi, I'm Dora!"))
 				}
 			}

v3/deployment.go

@@ -208,7 +208,7 @@ func checkAppRemainsAlive(appName string) (chan<- bool, <-chan bool) {
 				appCheckerIsDone <- true
 				return
 			case <-tickerChannel:
-				Expect(helpers.CurlAppRoot(Config, appName)).ToNot(ContainSubstring("404 Not Found"))
+				Expect(helpers.CurlAppRoot(Config, appName)).ToNot(ContainSubstring("404"))
 			}
 		}
 	}()

windows/readiness_healthcheck.go

@@ -70,7 +70,7 @@ var _ = WindowsDescribe("Readiness Healthcheck", func() {
 			By("verifying the app is removed from the routing table")
 			Eventually(func() string {
 				return helpers.CurlApp(Config, appName, "/ready")
-			}, readinessHealthCheckTimeout).Should(ContainSubstring("404 Not Found"))
+			}, readinessHealthCheckTimeout).Should(ContainSubstring("404"))
 
 			By("verifying that the app hasn't restarted")
 			Consistently(cf.Cf("events", appName)).ShouldNot(Say("audit.app.process.crash"))