Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

making http testing easier

goenning0740785be785
diff --git a/handler/index_test.go b/handler/index_test.go
index 8a545cdee..b56e52c87 100644
--- a/handler/index_test.go
+++ b/handler/index_test.go
@@ -1,15 +1,12 @@
package handler_test
import (
- "net/http"
- "net/http/httptest"
"testing"
"github.com/WeCanHearYou/wchy/context"
"github.com/WeCanHearYou/wchy/handler"
+ "github.com/WeCanHearYou/wchy/mock"
"github.com/WeCanHearYou/wchy/model"
- "github.com/WeCanHearYou/wchy/router"
- "github.com/labstack/echo"
. "github.com/onsi/gomega"
)
@@ -26,15 +23,9 @@ func TestIndexHandler(t *testing.T) {
Idea: &mockIdeaService{},
}
- e := echo.New()
- e.Renderer = router.NewHTMLRenderer()
+ server := mock.NewServer()
+ server.Context.Set("Tenant", &model.Tenant{ID: 2, Name: "Any Tenant"})
+ code, _ := server.Execute(handler.Index(ctx))
- req, _ := http.NewRequest(echo.GET, "/", nil)
- rec := httptest.NewRecorder()
- c := e.NewContext(req, rec)
- c.Set("Tenant", &model.Tenant{ID: 2, Name: "Any Tenant"})
-
- handler.Index(ctx)(c)
-
- Expect(rec.Code).To(Equal(200))
+ Expect(code).To(Equal(200))
}
diff --git a/handler/status_test.go b/handler/status_test.go
index e50a62e25..b3ebf54d9 100644
--- a/handler/status_test.go
+++ b/handler/status_test.go
@@ -26,8 +26,7 @@ func TestStatusHandler(t *testing.T) {
}
server := mock.NewServer()
- server.Register(handler.Status(ctx))
- status, query := server.Request()
+ status, query := server.Execute(handler.Status(ctx))
Expect(query.String("build")).To(Equal("today"))
Expect(query.Bool("healthy", "database")).To(Equal(false))
diff --git a/handler/tenant_test.go b/handler/tenant_test.go
index 57d7a68de..82ff2f89d 100644
--- a/handler/tenant_test.go
+++ b/handler/tenant_test.go
@@ -1,17 +1,13 @@
package handler_test
import (
- "encoding/json"
- "net/http"
- "net/http/httptest"
"testing"
"github.com/WeCanHearYou/wchy/context"
"github.com/WeCanHearYou/wchy/handler"
+ "github.com/WeCanHearYou/wchy/mock"
"github.com/WeCanHearYou/wchy/model"
"github.com/WeCanHearYou/wchy/service"
- "github.com/jmoiron/jsonq"
- "github.com/labstack/echo"
. "github.com/onsi/gomega"
)
@@ -31,35 +27,24 @@ var ctx *context.WchyContext = &context.WchyContext{
func TestTenantHandler_404(t *testing.T) {
RegisterTestingT(t)
- e := echo.New()
- req, _ := http.NewRequest(echo.GET, "/", nil)
- rec := httptest.NewRecorder()
- c := e.NewContext(req, rec)
- c.SetParamNames("domain")
- c.SetParamValues("unknown")
- handler.TenantByDomain(ctx)(c)
+ server := mock.NewServer()
+ server.Context.SetParamNames("domain")
+ server.Context.SetParamValues("unknown")
+ code, _ := server.Execute(handler.TenantByDomain(ctx))
- Expect(rec.Code).To(Equal(404))
+ Expect(code).To(Equal(404))
}
func TestTenantHandler_200(t *testing.T) {
RegisterTestingT(t)
- e := echo.New()
- req, _ := http.NewRequest(echo.GET, "/", nil)
- rec := httptest.NewRecorder()
- c := e.NewContext(req, rec)
- c.SetParamNames("domain")
- c.SetParamValues("trishop")
- handler.TenantByDomain(ctx)(c)
-
- var data interface{}
- decoder := json.NewDecoder(rec.Body)
- decoder.Decode(&data)
- query := jsonq.NewQuery(data)
+ server := mock.NewServer()
+ server.Context.SetParamNames("domain")
+ server.Context.SetParamValues("trishop")
+ code, query := server.Execute(handler.TenantByDomain(ctx))
Expect(query.Int("id")).To(Equal(2))
Expect(query.String("name")).To(Equal("The Triathlon Shop"))
Expect(query.String("domain")).To(Equal("trishop"))
- Expect(rec.Code).To(Equal(200))
+ Expect(code).To(Equal(200))
}
diff --git a/mock/server.go b/mock/server.go
index 3abbeb381..fe1335774 100644
--- a/mock/server.go
+++ b/mock/server.go
@@ -7,79 +7,48 @@ import (
"strings"
+ "github.com/WeCanHearYou/wchy/router"
"github.com/jmoiron/jsonq"
"github.com/labstack/echo"
)
// Server is a HTTP server wrapper for testing purpose
type Server struct {
- engine *echo.Echo
- handler echo.HandlerFunc
+ engine *echo.Echo
+ handler echo.HandlerFunc
+ Context echo.Context
+ recorder *httptest.ResponseRecorder
}
// NewServer creates a new test server
func NewServer() *Server {
engine := echo.New()
- //TODO: engine.HTMLRender = router.CreateTemplateRender()
+ engine.Renderer = router.NewHTMLRenderer()
+
+ request, _ := http.NewRequest(echo.GET, "/", nil)
+ recorder := httptest.NewRecorder()
+ context := engine.NewContext(request, recorder)
return &Server{
- engine: engine,
+ engine: engine,
+ recorder: recorder,
+ Context: context,
}
}
-// Use to register new middlewares
-func (s *Server) Use(mw echo.MiddlewareFunc) {
- s.engine.Use(mw)
-}
-
-// UseFunc to register new middlewares based on HandlerFunc
-func (s *Server) UseFunc(f echo.HandlerFunc) {
- s.engine.Use(func(next echo.HandlerFunc) echo.HandlerFunc {
- return f
- })
-}
-
-// Param can be used to set request parameters
-func (s *Server) Param(key, value string) {
- s.UseFunc(func(c echo.Context) error {
- c.SetParamNames(key)
- c.SetParamValues(value)
- return nil
- })
-}
-
-// Set can be used to set context values
-func (s *Server) Set(key string, value interface{}) {
- s.UseFunc(func(c echo.Context) error {
- c.Set(key, value)
- return nil
- })
-}
-
-// Register given handler
-func (s *Server) Register(handler echo.HandlerFunc) {
- s.handler = handler
-}
-
-// Request registered handler
-func (s *Server) Request() (int, *jsonq.JsonQuery) {
- req, _ := http.NewRequest(echo.GET, "/", nil)
- rec := httptest.NewRecorder()
-
- c := s.engine.NewContext(req, rec)
- s.handler(c)
-
- status := rec.Code
+// Execute a given handler using current server setup
+func (s *Server) Execute(handler echo.HandlerFunc) (int, *jsonq.JsonQuery) {
+ handler(s.Context)
- if status == 200 && hasJSON(rec) {
+ if s.recorder.Code == 200 && hasJSON(s.recorder) {
var data interface{}
- decoder := json.NewDecoder(rec.Body)
+ decoder := json.NewDecoder(s.recorder.Body)
decoder.Decode(&data)
query := jsonq.NewQuery(data)
- return status, query
+ return s.recorder.Code, query
}
- return status, nil
+ return s.recorder.Code, nil
}
func hasJSON(r *httptest.ResponseRecorder) bool {