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

Introduce ConfigMap updating helpers into e2e/framework and retain default nginx-configuration state between tests

Browse source 
Group sublogic
This commit is contained in:
Andrew Louis 2018-04-10 14:14:36 -04:00
parent 085263f318
commit 19337f05fb
4 changed files with 114 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

21
test/e2e/settings/server_tokens.go
View file

@ -31,18 +31,32 @@ import (
var _ = framework.IngressNginxDescribe("Server Tokens", func() {
f := framework.NewDefaultFramework("server-tokens")
serverTokens := "server-tokens"
var defaultNginxConfigMapData map[string]string = nil
BeforeEach(func() {
err := f.NewEchoDeployment()
Expect(err).NotTo(HaveOccurred())
if defaultNginxConfigMapData == nil {
defaultNginxConfigMapData, err = f.GetNginxConfigMapData()
Expect(err).NotTo(HaveOccurred())
Expect(defaultNginxConfigMapData).NotTo(BeNil())
}
})
AfterEach(func() {
updateConfigmap(serverTokens, "false", f.KubeClientSet)
err := f.SetNginxConfigMapData(defaultNginxConfigMapData)
Expect(err).NotTo(HaveOccurred())
})
<<<<<<< HEAD
It("should not exist Server header in the response", func() {
updateConfigmap(serverTokens, "false", f.KubeClientSet)
=======
It("should not exists Server header in the response", func() {
err := f.UpdateNginxConfigMapData(serverTokens, "false")
Expect(err).NotTo(HaveOccurred())
>>>>>>> Introduce ConfigMap updating helpers into e2e/framework and retain default nginx-configuration state between tests
ing, err := f.EnsureIngress(&v1beta1.Ingress{
ObjectMeta: metav1.ObjectMeta{
@ -83,8 +97,9 @@ var _ = framework.IngressNginxDescribe("Server Tokens", func() {
Expect(err).NotTo(HaveOccurred())
})
It("should exist Server header in the response when is enabled", func() {
updateConfigmap(serverTokens, "true", f.KubeClientSet)
It("should exists Server header in the response when is enabled", func() {
err := f.UpdateNginxConfigMapData(serverTokens, "true")
Expect(err).NotTo(HaveOccurred())
ing, err := f.EnsureIngress(&v1beta1.Ingress{
ObjectMeta: metav1.ObjectMeta{