Refactor e2e tests to use testify y httpexpect

This commit is contained in:
Manuel Alejandro de Brito Fontes 2020-02-19 00:08:56 -03:00
parent 046e2d959d
commit f9624cbe46
80 changed files with 2280 additions and 2631 deletions

View file

@ -17,11 +17,8 @@ limitations under the License.
package defaultbackend
import (
"crypto/tls"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
"github.com/parnurzeal/gorequest"
"github.com/onsi/ginkgo"
"github.com/stretchr/testify/assert"
"k8s.io/ingress-nginx/test/e2e/framework"
)
@ -29,35 +26,31 @@ import (
var _ = framework.IngressNginxDescribe("[Default Backend] SSL", func() {
f := framework.NewDefaultFramework("default-backend")
It("should return a self generated SSL certificate", func() {
By("checking SSL Certificate using the NGINX IP address")
resp, _, errs := gorequest.New().
Post(f.GetURL(framework.HTTPS)).
TLSClientConfig(&tls.Config{
// the default backend uses a self generated certificate
InsecureSkipVerify: true,
}).End()
ginkgo.It("should return a self generated SSL certificate", func() {
ginkgo.By("checking SSL Certificate using the NGINX IP address")
resp := f.HTTPTestClient().
GET("/").
WithURL(f.GetURL(framework.HTTPS)).
Expect().
Raw()
Expect(errs).Should(BeEmpty())
Expect(len(resp.TLS.PeerCertificates)).Should(BeNumerically("==", 1))
assert.Equal(ginkgo.GinkgoT(), len(resp.TLS.PeerCertificates), 1)
for _, pc := range resp.TLS.PeerCertificates {
Expect(pc.Issuer.CommonName).Should(Equal("Kubernetes Ingress Controller Fake Certificate"))
assert.Equal(ginkgo.GinkgoT(), pc.Issuer.CommonName, "Kubernetes Ingress Controller Fake Certificate")
}
By("checking SSL Certificate using the NGINX catch all server")
resp, _, errs = gorequest.New().
Post(f.GetURL(framework.HTTPS)).
TLSClientConfig(&tls.Config{
// the default backend uses a self generated certificate
InsecureSkipVerify: true,
}).
Set("Host", "foo.bar.com").End()
ginkgo.By("checking SSL Certificate using the NGINX catch all server")
resp = f.HTTPTestClient().
GET("/").
WithURL(f.GetURL(framework.HTTPS)).
WithHeader("Host", "foo.bar.com").
Expect().
Raw()
Expect(errs).Should(BeEmpty())
Expect(len(resp.TLS.PeerCertificates)).Should(BeNumerically("==", 1))
assert.Equal(ginkgo.GinkgoT(), len(resp.TLS.PeerCertificates), 1)
for _, pc := range resp.TLS.PeerCertificates {
Expect(pc.Issuer.CommonName).Should(Equal("Kubernetes Ingress Controller Fake Certificate"))
assert.Equal(ginkgo.GinkgoT(), pc.Issuer.CommonName, "Kubernetes Ingress Controller Fake Certificate")
}
})
})