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

fix e2e rests related to the removed string

Browse source
This commit is contained in:
Artem Miroshnychenko 2020-04-09 00:24:53 +03:00
parent ae88a7d2a8
commit 39c01c6f96
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -46,8 +46,7 @@ var _ = framework.DescribeAnnotation("permanen-redirect permanen-redirect-code",
f.WaitForNginxServer(host, f.WaitForNginxServer(host,
func(server string) bool { func(server string) bool {
return strings.Contains(server, fmt.Sprintf("if ($uri ~* %s) {", redirectPath)) && return strings.Contains(server, fmt.Sprintf("return 301 %s;", redirectURL))
strings.Contains(server, fmt.Sprintf("return 301 %s;", redirectURL))
}) })
ginkgo.By("sending request to redirected URL path") ginkgo.By("sending request to redirected URL path")
@ -77,8 +76,7 @@ var _ = framework.DescribeAnnotation("permanen-redirect permanen-redirect-code",
f.WaitForNginxServer(host, f.WaitForNginxServer(host,
func(server string) bool { func(server string) bool {
return strings.Contains(server, fmt.Sprintf("if ($uri ~* %s) {", redirectPath)) && return strings.Contains(server, fmt.Sprintf("return %d %s;", redirectCode, redirectURL))
strings.Contains(server, fmt.Sprintf("return %d %s;", redirectCode, redirectURL))
}) })
ginkgo.By("sending request to redirected URL path") ginkgo.By("sending request to redirected URL path")