Browse Source

Optimize tests

Volodymyr Tkach 2 years ago
parent
commit
cb18d116cb
1 changed files with 23 additions and 28 deletions
  1. 23 28
      utils/http/helpers/helpers_test.go

+ 23 - 28
utils/http/helpers/helpers_test.go

@@ -14,6 +14,8 @@ import (
 var _ = Describe("helpers", func() {
 var _ = Describe("helpers", func() {
 	var srv *httptest.Server
 	var srv *httptest.Server
 	var client *http.Client
 	var client *http.Client
+	var resp *http.Response
+	var err error
 
 
 	Context("ClientIP", func() {
 	Context("ClientIP", func() {
 		It("return client IP", func() {
 		It("return client IP", func() {
@@ -77,17 +79,16 @@ var _ = Describe("helpers", func() {
 		BeforeEach(func() {
 		BeforeEach(func() {
 			srv = httptest.NewServer(helpers.HandleAppStatus())
 			srv = httptest.NewServer(helpers.HandleAppStatus())
 			client = srv.Client()
 			client = srv.Client()
+			resp, err = client.Get(srv.URL + "/")
+			Expect(err).To(Succeed())
 		})
 		})
 
 
 		AfterEach(func() {
 		AfterEach(func() {
+			resp.Body.Close()
 			srv.Close()
 			srv.Close()
 		})
 		})
 
 
 		It("handle app status", func() {
 		It("handle app status", func() {
-			resp, err := client.Get(srv.URL + "/")
-			Expect(err).To(Succeed())
-			defer resp.Body.Close()
-
 			Expect(resp.StatusCode).To(Equal(http.StatusOK))
 			Expect(resp.StatusCode).To(Equal(http.StatusOK))
 			Expect(resp.Header.Get("Content-Type")).To(Equal("application/json"))
 			Expect(resp.Header.Get("Content-Type")).To(Equal("application/json"))
 
 
@@ -102,17 +103,16 @@ var _ = Describe("helpers", func() {
 		BeforeEach(func() {
 		BeforeEach(func() {
 			srv = httptest.NewServer(helpers.HandleFile("MyContent", "my/type"))
 			srv = httptest.NewServer(helpers.HandleFile("MyContent", "my/type"))
 			client = srv.Client()
 			client = srv.Client()
+			resp, err = client.Get(srv.URL + "/")
+			Expect(err).To(Succeed())
 		})
 		})
 
 
 		AfterEach(func() {
 		AfterEach(func() {
+			resp.Body.Close()
 			srv.Close()
 			srv.Close()
 		})
 		})
 
 
 		It("handle file", func() {
 		It("handle file", func() {
-			resp, err := client.Get(srv.URL + "/")
-			Expect(err).To(Succeed())
-			defer resp.Body.Close()
-
 			Expect(resp.StatusCode).To(Equal(http.StatusOK))
 			Expect(resp.StatusCode).To(Equal(http.StatusOK))
 			Expect(resp.Header.Get("Content-Type")).To(Equal("my/type"))
 			Expect(resp.Header.Get("Content-Type")).To(Equal("my/type"))
 
 
@@ -127,17 +127,16 @@ var _ = Describe("helpers", func() {
 		BeforeEach(func() {
 		BeforeEach(func() {
 			srv = httptest.NewServer(helpers.HandleImagePng("MyContent"))
 			srv = httptest.NewServer(helpers.HandleImagePng("MyContent"))
 			client = srv.Client()
 			client = srv.Client()
+			resp, err = client.Get(srv.URL + "/")
+			Expect(err).To(Succeed())
 		})
 		})
 
 
 		AfterEach(func() {
 		AfterEach(func() {
+			resp.Body.Close()
 			srv.Close()
 			srv.Close()
 		})
 		})
 
 
 		It("handle image png", func() {
 		It("handle image png", func() {
-			resp, err := client.Get(srv.URL + "/")
-			Expect(err).To(Succeed())
-			defer resp.Body.Close()
-
 			Expect(resp.StatusCode).To(Equal(http.StatusOK))
 			Expect(resp.StatusCode).To(Equal(http.StatusOK))
 			Expect(resp.Header.Get("Content-Type")).To(Equal("image/png"))
 			Expect(resp.Header.Get("Content-Type")).To(Equal("image/png"))
 
 
@@ -152,17 +151,16 @@ var _ = Describe("helpers", func() {
 		BeforeEach(func() {
 		BeforeEach(func() {
 			srv = httptest.NewServer(helpers.HandleTextCss("MyContent"))
 			srv = httptest.NewServer(helpers.HandleTextCss("MyContent"))
 			client = srv.Client()
 			client = srv.Client()
+			resp, err = client.Get(srv.URL + "/")
+			Expect(err).To(Succeed())
 		})
 		})
 
 
 		AfterEach(func() {
 		AfterEach(func() {
+			resp.Body.Close()
 			srv.Close()
 			srv.Close()
 		})
 		})
 
 
 		It("handle text css", func() {
 		It("handle text css", func() {
-			resp, err := client.Get(srv.URL + "/")
-			Expect(err).To(Succeed())
-			defer resp.Body.Close()
-
 			Expect(resp.StatusCode).To(Equal(http.StatusOK))
 			Expect(resp.StatusCode).To(Equal(http.StatusOK))
 			Expect(resp.Header.Get("Content-Type")).To(Equal("text/css"))
 			Expect(resp.Header.Get("Content-Type")).To(Equal("text/css"))
 
 
@@ -177,17 +175,16 @@ var _ = Describe("helpers", func() {
 		BeforeEach(func() {
 		BeforeEach(func() {
 			srv = httptest.NewServer(helpers.HandleTextJavaScript("MyContent"))
 			srv = httptest.NewServer(helpers.HandleTextJavaScript("MyContent"))
 			client = srv.Client()
 			client = srv.Client()
+			resp, err = client.Get(srv.URL + "/")
+			Expect(err).To(Succeed())
 		})
 		})
 
 
 		AfterEach(func() {
 		AfterEach(func() {
+			resp.Body.Close()
 			srv.Close()
 			srv.Close()
 		})
 		})
 
 
 		It("handle text javascript", func() {
 		It("handle text javascript", func() {
-			resp, err := client.Get(srv.URL + "/")
-			Expect(err).To(Succeed())
-			defer resp.Body.Close()
-
 			Expect(resp.StatusCode).To(Equal(http.StatusOK))
 			Expect(resp.StatusCode).To(Equal(http.StatusOK))
 			Expect(resp.Header.Get("Content-Type")).To(Equal("text/javascript"))
 			Expect(resp.Header.Get("Content-Type")).To(Equal("text/javascript"))
 
 
@@ -202,17 +199,16 @@ var _ = Describe("helpers", func() {
 		BeforeEach(func() {
 		BeforeEach(func() {
 			srv = httptest.NewServer(helpers.HandleTextPlain("MyContent"))
 			srv = httptest.NewServer(helpers.HandleTextPlain("MyContent"))
 			client = srv.Client()
 			client = srv.Client()
+			resp, err = client.Get(srv.URL + "/")
+			Expect(err).To(Succeed())
 		})
 		})
 
 
 		AfterEach(func() {
 		AfterEach(func() {
+			resp.Body.Close()
 			srv.Close()
 			srv.Close()
 		})
 		})
 
 
 		It("handle text plain", func() {
 		It("handle text plain", func() {
-			resp, err := client.Get(srv.URL + "/")
-			Expect(err).To(Succeed())
-			defer resp.Body.Close()
-
 			Expect(resp.StatusCode).To(Equal(http.StatusOK))
 			Expect(resp.StatusCode).To(Equal(http.StatusOK))
 			Expect(resp.Header.Get("Content-Type")).To(Equal("text/plain"))
 			Expect(resp.Header.Get("Content-Type")).To(Equal("text/plain"))
 
 
@@ -227,17 +223,16 @@ var _ = Describe("helpers", func() {
 		BeforeEach(func() {
 		BeforeEach(func() {
 			srv = httptest.NewServer(helpers.HandleTextXml("MyContent"))
 			srv = httptest.NewServer(helpers.HandleTextXml("MyContent"))
 			client = srv.Client()
 			client = srv.Client()
+			resp, err = client.Get(srv.URL + "/")
+			Expect(err).To(Succeed())
 		})
 		})
 
 
 		AfterEach(func() {
 		AfterEach(func() {
+			resp.Body.Close()
 			srv.Close()
 			srv.Close()
 		})
 		})
 
 
 		It("handle text xml", func() {
 		It("handle text xml", func() {
-			resp, err := client.Get(srv.URL + "/")
-			Expect(err).To(Succeed())
-			defer resp.Body.Close()
-
 			Expect(resp.StatusCode).To(Equal(http.StatusOK))
 			Expect(resp.StatusCode).To(Equal(http.StatusOK))
 			Expect(resp.Header.Get("Content-Type")).To(Equal("text/xml"))
 			Expect(resp.Header.Get("Content-Type")).To(Equal("text/xml"))