diff options
author | Ahmad Sherif <me@ahmadsherif.com> | 2017-01-11 21:18:49 +0300 |
---|---|---|
committer | Ahmad Sherif <me@ahmadsherif.com> | 2017-01-11 21:19:48 +0300 |
commit | 5d29b6b1071b94b3798f15e2f5600a603ed93419 (patch) | |
tree | 98a4fc03fa6558a109e2e108b5c666f09a7c33b9 | |
parent | 8ed72a7cff2c6afc7e10196be429fc7dc812485a (diff) |
Move handler functions to router package to ease testing
-rw-r--r-- | router/home.go (renamed from handler/home.go) | 2 | ||||
-rw-r--r-- | router/home_test.go (renamed from handler/home_test.go) | 4 | ||||
-rw-r--r-- | router/router.go | 4 |
3 files changed, 4 insertions, 6 deletions
diff --git a/handler/home.go b/router/home.go index a57a55da5..54d09d3c0 100644 --- a/handler/home.go +++ b/router/home.go @@ -1,4 +1,4 @@ -package handler +package router import ( "net/http" diff --git a/handler/home_test.go b/router/home_test.go index ba1c0e689..d947d60dc 100644 --- a/handler/home_test.go +++ b/router/home_test.go @@ -1,4 +1,4 @@ -package handler +package router import ( "net/http" @@ -14,7 +14,7 @@ func TestGetHome(t *testing.T) { t.Fatal("Creating 'GET /' request failed!") } - http.HandlerFunc(Home).ServeHTTP(recorder, req) + NewRouter().ServeHTTP(recorder, req) if recorder.Code != http.StatusOK { t.Fatal("Server error: Returned ", recorder.Code, " instead of ", http.StatusOK) diff --git a/router/router.go b/router/router.go index 0c929cb21..ec8c19e5e 100644 --- a/router/router.go +++ b/router/router.go @@ -6,14 +6,12 @@ import ( "github.com/gorilla/handlers" "github.com/gorilla/mux" - - "gitlab.com/gitlab-org/gitaly/handler" ) func NewRouter() http.Handler { r := mux.NewRouter() - r.HandleFunc("/", handler.Home) + r.HandleFunc("/", Home) return handlers.LoggingHandler(os.Stdout, r) } |