DevFW-CICD/ingress-nginx-helm
12
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refactor assertions

Browse source
This commit is contained in:
Manuel Alejandro de Brito Fontes 2018-11-18 10:53:05 -03:00
parent af2dce901d
commit a51136b863
18 changed files with 46 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
test/e2e/annotations/affinity.go
View file

@ -68,7 +68,7 @@ var _ = framework.IngressNginxDescribe("Annotations - Affinity/Sticky Sessions",
match := md5Regex.FindStringSubmatch(resp.Header.Get("Set-Cookie")) match := md5Regex.FindStringSubmatch(resp.Header.Get("Set-Cookie"))
Expect(len(match)).Should(BeNumerically("==", 1)) Expect(len(match)).Should(BeNumerically("==", 1))
Expect(len(errs)).Should(BeNumerically("==", 0)) Expect(errs).Should(BeEmpty())
Expect(resp.StatusCode).Should(Equal(http.StatusOK)) Expect(resp.StatusCode).Should(Equal(http.StatusOK))
Expect(resp.Header.Get("Set-Cookie")).Should(ContainSubstring(match[0])) Expect(resp.Header.Get("Set-Cookie")).Should(ContainSubstring(match[0]))
}) })
@ -97,7 +97,7 @@ var _ = framework.IngressNginxDescribe("Annotations - Affinity/Sticky Sessions",
match := sha1Regex.FindStringSubmatch(resp.Header.Get("Set-Cookie")) match := sha1Regex.FindStringSubmatch(resp.Header.Get("Set-Cookie"))
Expect(len(match)).Should(BeNumerically("==", 1)) Expect(len(match)).Should(BeNumerically("==", 1))
Expect(len(errs)).Should(BeNumerically("==", 0)) Expect(errs).Should(BeEmpty())
Expect(resp.StatusCode).Should(Equal(http.StatusOK)) Expect(resp.StatusCode).Should(Equal(http.StatusOK))
Expect(resp.Header.Get("Set-Cookie")).Should(ContainSubstring(match[0])) Expect(resp.Header.Get("Set-Cookie")).Should(ContainSubstring(match[0]))
}) })
@ -122,7 +122,7 @@ var _ = framework.IngressNginxDescribe("Annotations - Affinity/Sticky Sessions",
Set("Host", host). Set("Host", host).
End() End()
Expect(len(errs)).Should(BeNumerically("==", 0)) Expect(errs).Should(BeEmpty())
Expect(resp.StatusCode).Should(Equal(http.StatusOK)) Expect(resp.StatusCode).Should(Equal(http.StatusOK))
Expect(resp.Header.Get("Set-Cookie")).Should(ContainSubstring("Path=/something")) Expect(resp.Header.Get("Set-Cookie")).Should(ContainSubstring("Path=/something"))
}) })
@ -179,7 +179,7 @@ var _ = framework.IngressNginxDescribe("Annotations - Affinity/Sticky Sessions",
Set("Host", host). Set("Host", host).
End() End()
Expect(len(errs)).Should(BeNumerically("==", 0)) Expect(errs).Should(BeEmpty())
Expect(resp.StatusCode).Should(Equal(http.StatusOK)) Expect(resp.StatusCode).Should(Equal(http.StatusOK))
Expect(resp.Header.Get("Set-Cookie")).Should(ContainSubstring("Path=/something;")) Expect(resp.Header.Get("Set-Cookie")).Should(ContainSubstring("Path=/something;"))
@ -188,7 +188,7 @@ var _ = framework.IngressNginxDescribe("Annotations - Affinity/Sticky Sessions",
Set("Host", host). Set("Host", host).
End() End()
Expect(len(errs)).Should(BeNumerically("==", 0)) Expect(errs).Should(BeEmpty())
Expect(resp.StatusCode).Should(Equal(http.StatusOK)) Expect(resp.StatusCode).Should(Equal(http.StatusOK))
Expect(resp.Header.Get("Set-Cookie")).Should(ContainSubstring("Path=/somewhereelese;")) Expect(resp.Header.Get("Set-Cookie")).Should(ContainSubstring("Path=/somewhereelese;"))
}) })
@ -215,7 +215,7 @@ var _ = framework.IngressNginxDescribe("Annotations - Affinity/Sticky Sessions",
Set("Host", host). Set("Host", host).
End() End()
Expect(len(errs)).Should(BeNumerically("==", 0)) Expect(errs).Should(BeEmpty())
Expect(resp.StatusCode).Should(Equal(http.StatusOK)) Expect(resp.StatusCode).Should(Equal(http.StatusOK))
local, _ := time.LoadLocation("GMT") local, _ := time.LoadLocation("GMT")
duration, _ := time.ParseDuration("48h") duration, _ := time.ParseDuration("48h")

6
test/e2e/annotations/alias.go
View file

@ -55,7 +55,7 @@ var _ = framework.IngressNginxDescribe("Annotations - Alias", func() {
Set("Host", host). Set("Host", host).
End() End()
Expect(len(errs)).Should(BeNumerically("==", 0)) Expect(errs).Should(BeEmpty())
Expect(resp.StatusCode).Should(Equal(http.StatusOK)) Expect(resp.StatusCode).Should(Equal(http.StatusOK))
Expect(body).Should(ContainSubstring(fmt.Sprintf("host=%v", host))) Expect(body).Should(ContainSubstring(fmt.Sprintf("host=%v", host)))
@ -64,7 +64,7 @@ var _ = framework.IngressNginxDescribe("Annotations - Alias", func() {
Set("Host", "bar"). Set("Host", "bar").
End() End()
Expect(len(errs)).Should(BeNumerically("==", 0)) Expect(errs).Should(BeEmpty())
Expect(resp.StatusCode).Should(Equal(http.StatusNotFound)) Expect(resp.StatusCode).Should(Equal(http.StatusNotFound))
Expect(body).Should(ContainSubstring("404 Not Found")) Expect(body).Should(ContainSubstring("404 Not Found"))
}) })
@ -91,7 +91,7 @@ var _ = framework.IngressNginxDescribe("Annotations - Alias", func() {
Set("Host", host). Set("Host", host).
End() End()
Expect(len(errs)).Should(BeNumerically("==", 0)) Expect(errs).Should(BeEmpty())
Expect(resp.StatusCode).Should(Equal(http.StatusOK)) Expect(resp.StatusCode).Should(Equal(http.StatusOK))
Expect(body).Should(ContainSubstring(fmt.Sprintf("host=%v", host))) Expect(body).Should(ContainSubstring(fmt.Sprintf("host=%v", host)))
} }

2
test/e2e/annotations/approot.go
View file

@ -59,7 +59,7 @@ var _ = framework.IngressNginxDescribe("Annotations - Approot", func() {
Set("Host", host). Set("Host", host).
End() End()
Expect(len(errs)).Should(BeNumerically("==", 0)) Expect(errs).Should(BeEmpty())
Expect(resp.StatusCode).Should(Equal(http.StatusFound)) Expect(resp.StatusCode).Should(Equal(http.StatusFound))
Expect(resp.Header.Get("Location")).Should(Equal("http://approot.bar.com/foo")) Expect(resp.Header.Get("Location")).Should(Equal("http://approot.bar.com/foo"))
}) })

12
test/e2e/annotations/auth.go
View file

@ -63,7 +63,7 @@ var _ = framework.IngressNginxDescribe("Annotations - Auth", func() {
Set("Host", host). Set("Host", host).
End() End()
Expect(len(errs)).Should(BeNumerically("==", 0)) Expect(errs).Should(BeEmpty())
Expect(resp.StatusCode).Should(Equal(http.StatusOK)) Expect(resp.StatusCode).Should(Equal(http.StatusOK))
Expect(body).Should(ContainSubstring(fmt.Sprintf("host=%v", host))) Expect(body).Should(ContainSubstring(fmt.Sprintf("host=%v", host)))
}) })
@ -91,7 +91,7 @@ var _ = framework.IngressNginxDescribe("Annotations - Auth", func() {
Set("Host", host). Set("Host", host).
End() End()
Expect(len(errs)).Should(BeNumerically("==", 0)) Expect(errs).Should(BeEmpty())
Expect(resp.StatusCode).Should(Equal(http.StatusServiceUnavailable)) Expect(resp.StatusCode).Should(Equal(http.StatusServiceUnavailable))
Expect(body).Should(ContainSubstring("503 Service Temporarily Unavailable")) Expect(body).Should(ContainSubstring("503 Service Temporarily Unavailable"))
}) })
@ -122,7 +122,7 @@ var _ = framework.IngressNginxDescribe("Annotations - Auth", func() {
Set("Host", host). Set("Host", host).
End() End()
Expect(len(errs)).Should(BeNumerically("==", 0)) Expect(errs).Should(BeEmpty())
Expect(resp.StatusCode).Should(Equal(http.StatusUnauthorized)) Expect(resp.StatusCode).Should(Equal(http.StatusUnauthorized))
Expect(body).Should(ContainSubstring("401 Authorization Required")) Expect(body).Should(ContainSubstring("401 Authorization Required"))
}) })
@ -154,7 +154,7 @@ var _ = framework.IngressNginxDescribe("Annotations - Auth", func() {
SetBasicAuth("user", "pass"). SetBasicAuth("user", "pass").
End() End()
Expect(len(errs)).Should(BeNumerically("==", 0)) Expect(errs).Should(BeEmpty())
Expect(resp.StatusCode).Should(Equal(http.StatusUnauthorized)) Expect(resp.StatusCode).Should(Equal(http.StatusUnauthorized))
Expect(body).Should(ContainSubstring("401 Authorization Required")) Expect(body).Should(ContainSubstring("401 Authorization Required"))
}) })
@ -186,7 +186,7 @@ var _ = framework.IngressNginxDescribe("Annotations - Auth", func() {
SetBasicAuth("foo", "bar"). SetBasicAuth("foo", "bar").
End() End()
Expect(len(errs)).Should(BeNumerically("==", 0)) Expect(errs).Should(BeEmpty())
Expect(resp.StatusCode).Should(Equal(http.StatusOK)) Expect(resp.StatusCode).Should(Equal(http.StatusOK))
}) })
@ -229,7 +229,7 @@ var _ = framework.IngressNginxDescribe("Annotations - Auth", func() {
SetBasicAuth("foo", "bar"). SetBasicAuth("foo", "bar").
End() End()
Expect(len(errs)).Should(BeNumerically("==", 0)) Expect(errs).Should(BeEmpty())
Expect(resp.StatusCode).Should(Equal(http.StatusInternalServerError)) Expect(resp.StatusCode).Should(Equal(http.StatusInternalServerError))
}) })

10
test/e2e/annotations/authtls.go
View file

@ -81,7 +81,7 @@ var _ = framework.IngressNginxDescribe("Annotations - AuthTLS", func() {
TLSClientConfig(&tls.Config{ServerName: host, InsecureSkipVerify: true}). TLSClientConfig(&tls.Config{ServerName: host, InsecureSkipVerify: true}).
Set("Host", host). Set("Host", host).
End() End()
Expect(len(errs)).Should(BeNumerically("==", 0)) Expect(errs).Should(BeEmpty())
Expect(resp.StatusCode).Should(Equal(http.StatusBadRequest)) Expect(resp.StatusCode).Should(Equal(http.StatusBadRequest))
// Send Request Passing the Client Certs // Send Request Passing the Client Certs
@ -90,7 +90,7 @@ var _ = framework.IngressNginxDescribe("Annotations - AuthTLS", func() {
TLSClientConfig(clientConfig). TLSClientConfig(clientConfig).
Set("Host", host). Set("Host", host).
End() End()
Expect(len(errs)).Should(BeNumerically("==", 0)) Expect(errs).Should(BeEmpty())
Expect(resp.StatusCode).Should(Equal(http.StatusOK)) Expect(resp.StatusCode).Should(Equal(http.StatusOK))
}) })
@ -135,7 +135,7 @@ var _ = framework.IngressNginxDescribe("Annotations - AuthTLS", func() {
TLSClientConfig(&tls.Config{ServerName: host, InsecureSkipVerify: true}). TLSClientConfig(&tls.Config{ServerName: host, InsecureSkipVerify: true}).
Set("Host", host). Set("Host", host).
End() End()
Expect(len(errs)).Should(BeNumerically("==", 0)) Expect(errs).Should(BeEmpty())
Expect(resp.StatusCode).Should(Equal(http.StatusOK)) Expect(resp.StatusCode).Should(Equal(http.StatusOK))
}) })
@ -191,7 +191,7 @@ var _ = framework.IngressNginxDescribe("Annotations - AuthTLS", func() {
Set("Host", host). Set("Host", host).
RedirectPolicy(noRedirectPolicyFunc). RedirectPolicy(noRedirectPolicyFunc).
End() End()
Expect(len(errs)).Should(BeNumerically("==", 0)) Expect(errs).Should(BeEmpty())
Expect(resp.StatusCode).Should(Equal(http.StatusFound)) Expect(resp.StatusCode).Should(Equal(http.StatusFound))
Expect(resp.Header.Get("Location")).Should(Equal(f.IngressController.HTTPURL + errorPath)) Expect(resp.Header.Get("Location")).Should(Equal(f.IngressController.HTTPURL + errorPath))
@ -201,7 +201,7 @@ var _ = framework.IngressNginxDescribe("Annotations - AuthTLS", func() {
TLSClientConfig(clientConfig). TLSClientConfig(clientConfig).
Set("Host", host). Set("Host", host).
End() End()
Expect(len(errs)).Should(BeNumerically("==", 0)) Expect(errs).Should(BeEmpty())
Expect(resp.StatusCode).Should(Equal(http.StatusOK)) Expect(resp.StatusCode).Should(Equal(http.StatusOK))
}) })
}) })

8
test/e2e/annotations/canary.go
View file

@ -76,7 +76,7 @@ var _ = framework.IngressNginxDescribe("Annotations - canary", func() {
Set("CanaryByHeader", "always"). Set("CanaryByHeader", "always").
End() End()
Expect(len(errs)).Should(BeNumerically("==", 0)) Expect(errs).Should(BeEmpty())
Expect(resp.StatusCode).ShouldNot(Equal(http.StatusNotFound)) Expect(resp.StatusCode).ShouldNot(Equal(http.StatusNotFound))
Expect(body).Should(ContainSubstring("http-svc-canary")) Expect(body).Should(ContainSubstring("http-svc-canary"))
}) })
@ -113,7 +113,7 @@ var _ = framework.IngressNginxDescribe("Annotations - canary", func() {
Set("CanaryByHeader", "never"). Set("CanaryByHeader", "never").
End() End()
Expect(len(errs)).Should(BeNumerically("==", 0)) Expect(errs).Should(BeEmpty())
Expect(resp.StatusCode).ShouldNot(Equal(http.StatusNotFound)) Expect(resp.StatusCode).ShouldNot(Equal(http.StatusNotFound))
Expect(body).ShouldNot(ContainSubstring("http-svc-canary")) Expect(body).ShouldNot(ContainSubstring("http-svc-canary"))
}) })
@ -152,7 +152,7 @@ var _ = framework.IngressNginxDescribe("Annotations - canary", func() {
AddCookie(&http.Cookie{Name: "CanaryByCookie", Value: "always"}). AddCookie(&http.Cookie{Name: "CanaryByCookie", Value: "always"}).
End() End()
Expect(len(errs)).Should(BeNumerically("==", 0)) Expect(errs).Should(BeEmpty())
Expect(resp.StatusCode).ShouldNot(Equal(http.StatusNotFound)) Expect(resp.StatusCode).ShouldNot(Equal(http.StatusNotFound))
Expect(body).Should(ContainSubstring("http-svc-canary")) Expect(body).Should(ContainSubstring("http-svc-canary"))
}) })
@ -191,7 +191,7 @@ var _ = framework.IngressNginxDescribe("Annotations - canary", func() {
AddCookie(&http.Cookie{Name: "CanaryByCookie", Value: "never"}). AddCookie(&http.Cookie{Name: "CanaryByCookie", Value: "never"}).
End() End()
Expect(len(errs)).Should(BeNumerically("==", 0)) Expect(errs).Should(BeEmpty())
Expect(resp.StatusCode).ShouldNot(Equal(http.StatusNotFound)) Expect(resp.StatusCode).ShouldNot(Equal(http.StatusNotFound))
Expect(body).ShouldNot(ContainSubstring("http-svc-canary")) Expect(body).ShouldNot(ContainSubstring("http-svc-canary"))
}) })

2
test/e2e/annotations/connection.go
View file

@ -57,7 +57,7 @@ var _ = framework.IngressNginxDescribe("Annotations - Connection", func() {
Set("Host", host). Set("Host", host).
End() End()
Expect(len(errs)).Should(BeNumerically("==", 0)) Expect(errs).Should(BeEmpty())
Expect(resp.StatusCode).Should(Equal(http.StatusOK)) Expect(resp.StatusCode).Should(Equal(http.StatusOK))
Expect(body).Should(ContainSubstring(fmt.Sprintf("connection=keep-alive"))) Expect(body).Should(ContainSubstring(fmt.Sprintf("connection=keep-alive")))
}) })

2
test/e2e/annotations/cors.go
View file

@ -75,7 +75,7 @@ var _ = framework.IngressNginxDescribe("Annotations - CORS", func() {
Options(f.IngressController.HTTPURL+uri). Options(f.IngressController.HTTPURL+uri).
Set("Host", host). Set("Host", host).
End() End()
Expect(len(errs)).Should(BeNumerically("==", 0)) Expect(errs).Should(BeEmpty())
Expect(resp.StatusCode).Should(Equal(http.StatusNoContent)) Expect(resp.StatusCode).Should(Equal(http.StatusNoContent))
}) })

2
test/e2e/annotations/default_backend.go
View file

@ -58,7 +58,7 @@ var _ = framework.IngressNginxDescribe("Annotations - custom default-backend", f
Set("Host", host). Set("Host", host).
End() End()
Expect(len(errs)).Should(BeNumerically("==", 0)) Expect(errs).Should(BeEmpty())
Expect(resp.StatusCode).Should(Equal(http.StatusOK)) Expect(resp.StatusCode).Should(Equal(http.StatusOK))
Expect(body).To(ContainSubstring("x-code=503")) Expect(body).To(ContainSubstring("x-code=503"))

2
test/e2e/annotations/forcesslredirect.go
View file

@ -59,7 +59,7 @@ var _ = framework.IngressNginxDescribe("Annotations - Forcesslredirect", func()
Set("Host", host). Set("Host", host).
End() End()
Expect(len(errs)).Should(BeNumerically("==", 0)) Expect(errs).Should(BeEmpty())
Expect(resp.StatusCode).Should(Equal(http.StatusPermanentRedirect)) Expect(resp.StatusCode).Should(Equal(http.StatusPermanentRedirect))
Expect(resp.Header.Get("Location")).Should(Equal("https://forcesslredirect.bar.com/")) Expect(resp.Header.Get("Location")).Should(Equal("https://forcesslredirect.bar.com/"))
}) })

2
test/e2e/annotations/fromtowwwredirect.go
View file

@ -63,7 +63,7 @@ var _ = framework.IngressNginxDescribe("Annotations - Fromtowwwredirect", func()
Set("Host", fmt.Sprintf("%s.%s", "www", host)). Set("Host", fmt.Sprintf("%s.%s", "www", host)).
End() End()
Expect(len(errs)).Should(BeNumerically("==", 0)) Expect(errs).Should(BeEmpty())
Expect(resp.StatusCode).Should(Equal(http.StatusPermanentRedirect)) Expect(resp.StatusCode).Should(Equal(http.StatusPermanentRedirect))
Expect(resp.Header.Get("Location")).Should(Equal("http://fromtowwwredirect.bar.com/foo")) Expect(resp.Header.Get("Location")).Should(Equal("http://fromtowwwredirect.bar.com/foo"))
}) })

2
test/e2e/defaultbackend/default_backend.go
View file

@ -94,7 +94,7 @@ var _ = framework.IngressNginxDescribe("Default backend", func() {
} }
resp, _, errs := cm.End() resp, _, errs := cm.End()
Expect(len(errs)).Should(BeNumerically("==", 0)) Expect(errs).Should(BeEmpty())
Expect(resp.StatusCode).Should(Equal(test.Status)) Expect(resp.StatusCode).Should(Equal(test.Status))
} }
}) })

4
test/e2e/defaultbackend/ssl.go
View file

@ -44,7 +44,7 @@ var _ = framework.IngressNginxDescribe("Default backend - SSL", func() {
InsecureSkipVerify: true, InsecureSkipVerify: true,
}).End() }).End()
Expect(len(errs)).Should(BeNumerically("==", 0)) Expect(errs).Should(BeEmpty())
Expect(len(resp.TLS.PeerCertificates)).Should(BeNumerically("==", 1)) Expect(len(resp.TLS.PeerCertificates)).Should(BeNumerically("==", 1))
for _, pc := range resp.TLS.PeerCertificates { for _, pc := range resp.TLS.PeerCertificates {
@ -59,7 +59,7 @@ var _ = framework.IngressNginxDescribe("Default backend - SSL", func() {
InsecureSkipVerify: true, InsecureSkipVerify: true,
}). }).
Set("Host", "foo.bar.com").End() Set("Host", "foo.bar.com").End()
Expect(len(errs)).Should(BeNumerically("==", 0)) Expect(errs).Should(BeEmpty())
Expect(len(resp.TLS.PeerCertificates)).Should(BeNumerically("==", 1)) Expect(len(resp.TLS.PeerCertificates)).Should(BeNumerically("==", 1))
for _, pc := range resp.TLS.PeerCertificates { for _, pc := range resp.TLS.PeerCertificates {
Expect(pc.Issuer.CommonName).Should(Equal("Kubernetes Ingress Controller Fake Certificate")) Expect(pc.Issuer.CommonName).Should(Equal("Kubernetes Ingress Controller Fake Certificate"))

4
test/e2e/servicebackend/service_backend.go
View file

@ -56,7 +56,7 @@ var _ = framework.IngressNginxDescribe("Service backend - 503", func() {
Get(f.IngressController.HTTPURL). Get(f.IngressController.HTTPURL).
Set("Host", host). Set("Host", host).
End() End()
Expect(len(errs)).Should(BeNumerically("==", 0)) Expect(errs).Should(BeEmpty())
Expect(resp.StatusCode).Should(Equal(503)) Expect(resp.StatusCode).Should(Equal(503))
}) })
@ -79,7 +79,7 @@ var _ = framework.IngressNginxDescribe("Service backend - 503", func() {
Get(f.IngressController.HTTPURL). Get(f.IngressController.HTTPURL).
Set("Host", host). Set("Host", host).
End() End()
Expect(len(errs)).Should(BeNumerically("==", 0)) Expect(errs).Should(BeEmpty())
Expect(resp.StatusCode).Should(Equal(503)) Expect(resp.StatusCode).Should(Equal(503))
}) })

4
test/e2e/settings/forwarded_headers.go
View file

@ -63,7 +63,7 @@ var _ = framework.IngressNginxDescribe("X-Forwarded headers", func() {
Set("X-Forwarded-Host", "myhost"). Set("X-Forwarded-Host", "myhost").
End() End()
Expect(len(errs)).Should(BeNumerically("==", 0)) Expect(errs).Should(BeEmpty())
Expect(resp.StatusCode).Should(Equal(http.StatusOK)) Expect(resp.StatusCode).Should(Equal(http.StatusOK))
Expect(body).Should(ContainSubstring(fmt.Sprintf("host=myhost"))) Expect(body).Should(ContainSubstring(fmt.Sprintf("host=myhost")))
Expect(body).Should(ContainSubstring(fmt.Sprintf("x-forwarded-host=myhost"))) Expect(body).Should(ContainSubstring(fmt.Sprintf("x-forwarded-host=myhost")))
@ -92,7 +92,7 @@ var _ = framework.IngressNginxDescribe("X-Forwarded headers", func() {
Set("X-Forwarded-Host", "myhost"). Set("X-Forwarded-Host", "myhost").
End() End()
Expect(len(errs)).Should(BeNumerically("==", 0)) Expect(errs).Should(BeEmpty())
Expect(resp.StatusCode).Should(Equal(http.StatusOK)) Expect(resp.StatusCode).Should(Equal(http.StatusOK))
Expect(body).Should(ContainSubstring(fmt.Sprintf("host=forwarded-headers"))) Expect(body).Should(ContainSubstring(fmt.Sprintf("host=forwarded-headers")))
Expect(body).Should(ContainSubstring(fmt.Sprintf("x-forwarded-port=80"))) Expect(body).Should(ContainSubstring(fmt.Sprintf("x-forwarded-port=80")))

6
test/e2e/settings/no_auth_locations.go
View file

@ -67,7 +67,7 @@ var _ = framework.IngressNginxDescribe("No Auth locations", func() {
Set("Host", host). Set("Host", host).
End() End()
Expect(len(errs)).Should(BeNumerically("==", 0)) Expect(errs).Should(BeEmpty())
Expect(resp.StatusCode).Should(Equal(http.StatusUnauthorized)) Expect(resp.StatusCode).Should(Equal(http.StatusUnauthorized))
Expect(body).Should(ContainSubstring("401 Authorization Required")) Expect(body).Should(ContainSubstring("401 Authorization Required"))
}) })
@ -84,7 +84,7 @@ var _ = framework.IngressNginxDescribe("No Auth locations", func() {
SetBasicAuth(username, password). SetBasicAuth(username, password).
End() End()
Expect(len(errs)).Should(BeNumerically("==", 0)) Expect(errs).Should(BeEmpty())
Expect(resp.StatusCode).Should(Equal(http.StatusOK)) Expect(resp.StatusCode).Should(Equal(http.StatusOK))
}) })
@ -99,7 +99,7 @@ var _ = framework.IngressNginxDescribe("No Auth locations", func() {
Set("Host", host). Set("Host", host).
End() End()
Expect(len(errs)).Should(BeNumerically("==", 0)) Expect(errs).Should(BeEmpty())
Expect(resp.StatusCode).Should(Equal(http.StatusOK)) Expect(resp.StatusCode).Should(Equal(http.StatusOK))
}) })
}) })

10
test/e2e/settings/tls.go
View file

@ -67,7 +67,7 @@ var _ = framework.IngressNginxDescribe("Settings - TLS)", func() {
Set("Host", host). Set("Host", host).
End() End()
Expect(len(errs)).Should(BeNumerically("==", 0)) Expect(errs).Should(BeEmpty())
Expect(resp.StatusCode).Should(Equal(http.StatusOK)) Expect(resp.StatusCode).Should(Equal(http.StatusOK))
Expect(resp.TLS.Version).Should(BeNumerically("==", tls.VersionTLS12)) Expect(resp.TLS.Version).Should(BeNumerically("==", tls.VersionTLS12))
Expect(resp.TLS.CipherSuite).Should(BeNumerically("==", tls.TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384)) Expect(resp.TLS.CipherSuite).Should(BeNumerically("==", tls.TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384))
@ -86,7 +86,7 @@ var _ = framework.IngressNginxDescribe("Settings - TLS)", func() {
Set("Host", host). Set("Host", host).
End() End()
Expect(len(errs)).Should(BeNumerically("==", 0)) Expect(errs).Should(BeEmpty())
Expect(resp.StatusCode).Should(Equal(http.StatusOK)) Expect(resp.StatusCode).Should(Equal(http.StatusOK))
Expect(resp.TLS.Version).Should(BeNumerically("==", tls.VersionTLS10)) Expect(resp.TLS.Version).Should(BeNumerically("==", tls.VersionTLS10))
Expect(resp.TLS.CipherSuite).Should(BeNumerically("==", tls.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA)) Expect(resp.TLS.CipherSuite).Should(BeNumerically("==", tls.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA))
@ -116,7 +116,7 @@ var _ = framework.IngressNginxDescribe("Settings - TLS)", func() {
Set("Host", host). Set("Host", host).
End() End()
Expect(len(errs)).Should(BeNumerically("==", 0)) Expect(errs).Should(BeEmpty())
Expect(resp.StatusCode).Should(Equal(http.StatusOK)) Expect(resp.StatusCode).Should(Equal(http.StatusOK))
Expect(resp.Header.Get("Strict-Transport-Security")).Should(ContainSubstring("max-age=86400")) Expect(resp.Header.Get("Strict-Transport-Security")).Should(ContainSubstring("max-age=86400"))
@ -134,7 +134,7 @@ var _ = framework.IngressNginxDescribe("Settings - TLS)", func() {
Set("Host", host). Set("Host", host).
End() End()
Expect(len(errs)).Should(BeNumerically("==", 0)) Expect(errs).Should(BeEmpty())
Expect(resp.StatusCode).Should(Equal(http.StatusOK)) Expect(resp.StatusCode).Should(Equal(http.StatusOK))
Expect(resp.Header.Get("Strict-Transport-Security")).ShouldNot(ContainSubstring("includeSubDomains")) Expect(resp.Header.Get("Strict-Transport-Security")).ShouldNot(ContainSubstring("includeSubDomains"))
@ -152,7 +152,7 @@ var _ = framework.IngressNginxDescribe("Settings - TLS)", func() {
Set("Host", host). Set("Host", host).
End() End()
Expect(len(errs)).Should(BeNumerically("==", 0)) Expect(errs).Should(BeEmpty())
Expect(resp.StatusCode).Should(Equal(http.StatusOK)) Expect(resp.StatusCode).Should(Equal(http.StatusOK))
Expect(resp.Header.Get("Strict-Transport-Security")).Should(ContainSubstring("preload")) Expect(resp.Header.Get("Strict-Transport-Security")).Should(ContainSubstring("preload"))
}) })

2
test/e2e/tcpudp/tcp.go
View file

@ -91,7 +91,7 @@ var _ = framework.IngressNginxDescribe("TCP Feature", func() {
resp, _, errs := gorequest.New(). resp, _, errs := gorequest.New().
Get(fmt.Sprintf("http://%v:%v", ip, port)). Get(fmt.Sprintf("http://%v:%v", ip, port)).
End() End()
Expect(len(errs)).Should(BeEmpty()) Expect(errs).Should(BeEmpty())
Expect(resp.StatusCode).Should(Equal(200)) Expect(resp.StatusCode).Should(Equal(200))
}) })
}) })