Refactor e2e tests to use testify y httpexpect

test/e2e/annotations/http2pushpreload.go

@@ -17,19 +17,21 @@ limitations under the License.
 package annotations
 
 import (
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
+	"strings"
+
+	"github.com/onsi/ginkgo"
+
 	"k8s.io/ingress-nginx/test/e2e/framework"
 )
 
 var _ = framework.DescribeAnnotation("http2-push-preload", func() {
 	f := framework.NewDefaultFramework("http2pushpreload")
 
-	BeforeEach(func() {
-		f.NewEchoDeploymentWithReplicas(2)
+	ginkgo.BeforeEach(func() {
+		f.NewEchoDeployment()
 	})
 
-	It("enable the http2-push-preload directive", func() {
+	ginkgo.It("enable the http2-push-preload directive", func() {
 		host := "http2pp.foo.com"
 		annotations := map[string]string{
 			"nginx.ingress.kubernetes.io/http2-push-preload": "true",
@@ -40,7 +42,7 @@ var _ = framework.DescribeAnnotation("http2-push-preload", func() {
 
 		f.WaitForNginxServer(host,
 			func(server string) bool {
-				return Expect(server).Should(ContainSubstring("http2_push_preload on;"))
+				return strings.Contains(server, "http2_push_preload on;")
 			})
 	})
 })