domain: syncs unit tests

Author: chris-ramon

domain/auth/handler_test.go

@@ -11,7 +11,6 @@ import (
 	"testing"
 
 	"github.com/chris-ramon/golang-scaffolding/domain/auth/types"
-	"github.com/julienschmidt/httprouter"
 )
 
 type testReaderError int
@@ -37,9 +36,8 @@ func TestGetPing(t *testing.T) {
 	h := NewHandlers(&serviceMock{})
 	req := httptest.NewRequest("GET", "/ping", nil)
 	w := httptest.NewRecorder()
-	params := httprouter.Params{}
 
-	h.GetPing()(w, req, params)
+	h.GetPing()(w, req)
 
 	body, err := io.ReadAll(w.Result().Body)
 	if err != nil {
@@ -56,7 +54,6 @@ func TestGetCurrentUser(t *testing.T) {
 		srvMock            *serviceMock
 		request            *http.Request
 		responseWriter     *httptest.ResponseRecorder
-		params             httprouter.Params
 		header             http.Header
 		expectedBody       string
 		expectedStatusCode uint
@@ -74,7 +71,6 @@ func TestGetCurrentUser(t *testing.T) {
 			},
 			request:        httptest.NewRequest("GET", "/auth/current-user", nil),
 			responseWriter: httptest.NewRecorder(),
-			params:         httprouter.Params{},
 			header: map[string][]string{
 				"Authorization": []string{"Bearer Test-JWT-Token"},
 			},
@@ -86,7 +82,6 @@ func TestGetCurrentUser(t *testing.T) {
 			srvMock:            &serviceMock{},
 			request:            httptest.NewRequest("GET", "/auth/current-user", nil),
 			responseWriter:     httptest.NewRecorder(),
-			params:             httprouter.Params{},
 			header:             map[string][]string{},
 			expectedBody:       "failed to get authorization header",
 			expectedStatusCode: http.StatusInternalServerError,
@@ -100,7 +95,6 @@ func TestGetCurrentUser(t *testing.T) {
 			},
 			request:        httptest.NewRequest("GET", "/auth/current-user", nil),
 			responseWriter: httptest.NewRecorder(),
-			params:         httprouter.Params{},
 			header: map[string][]string{
 				"Authorization": []string{"Bearer Test-JWT-Token"},
 			},
@@ -119,7 +113,7 @@ func TestGetCurrentUser(t *testing.T) {
 				}
 			}
 
-			h.GetCurrentUser()(testCase.responseWriter, testCase.request, testCase.params)
+			h.GetCurrentUser()(testCase.responseWriter, testCase.request)
 
 			if !strings.Contains(testCase.responseWriter.Body.String(), testCase.expectedBody) {
 				t.Fatalf("expected: %v, got: %v", testCase.expectedBody, testCase.responseWriter.Body.String())
@@ -134,7 +128,6 @@ func TestPostSignIn(t *testing.T) {
 		srvMock        *serviceMock
 		request        *http.Request
 		responseWriter *httptest.ResponseRecorder
-		params         httprouter.Params
 		expectedBody   string
 	}
 
@@ -154,7 +147,6 @@ func TestPostSignIn(t *testing.T) {
 				bytes.NewBuffer([]byte(`{"email":"[email protected]","password":"test-pwd"}`)),
 			),
 			responseWriter: httptest.NewRecorder(),
-			params:         httprouter.Params{},
 			expectedBody:   "test user",
 		},
 		{
@@ -172,7 +164,6 @@ func TestPostSignIn(t *testing.T) {
 				testReaderError(0),
 			),
 			responseWriter: httptest.NewRecorder(),
-			params:         httprouter.Params{},
 			expectedBody:   "failed to read request body",
 		},
 		{
@@ -190,7 +181,6 @@ func TestPostSignIn(t *testing.T) {
 				bytes.NewBuffer([]byte(`{invalid}`)),
 			),
 			responseWriter: httptest.NewRecorder(),
-			params:         httprouter.Params{},
 			expectedBody:   "failed to json unmarshal request body",
 		},
 		{
@@ -206,15 +196,14 @@ func TestPostSignIn(t *testing.T) {
 				bytes.NewBuffer([]byte(`{"email":"[email protected]","password":"test-pwd"}`)),
 			),
 			responseWriter: httptest.NewRecorder(),
-			params:         httprouter.Params{},
 			expectedBody:   "failed to find current user",
 		},
 	}
 
 	for _, testCase := range testCases {
 		t.Run(testCase.name, func(t *testing.T) {
 			h := NewHandlers(testCase.srvMock)
-			h.PostSignIn()(testCase.responseWriter, testCase.request, testCase.params)
+			h.PostSignIn()(testCase.responseWriter, testCase.request)
 			if !strings.Contains(testCase.responseWriter.Body.String(), testCase.expectedBody) {
 				t.Fatalf("expected: %v, got: %v", testCase.expectedBody, testCase.responseWriter.Body.String())
 			}

domain/auth/route_test.go

@@ -4,28 +4,26 @@ import (
 	"net/http"
 	"testing"
 
-	"github.com/julienschmidt/httprouter"
-
 	"github.com/chris-ramon/golang-scaffolding/pkg/route"
 )
 
 type handlersMock struct {
-	getPing        httprouter.Handle
-	getCurrentUser httprouter.Handle
-	postSignIn     httprouter.Handle
+	getPing        http.HandlerFunc
+	getCurrentUser http.HandlerFunc
+	postSignIn     http.HandlerFunc
 }
 
-func (h *handlersMock) GetPing() httprouter.Handle        { return h.getPing }
-func (h *handlersMock) GetCurrentUser() httprouter.Handle { return h.getCurrentUser }
-func (h *handlersMock) PostSignIn() httprouter.Handle     { return h.postSignIn }
+func (h *handlersMock) GetPing() http.HandlerFunc        { return h.getPing }
+func (h *handlersMock) GetCurrentUser() http.HandlerFunc { return h.getCurrentUser }
+func (h *handlersMock) PostSignIn() http.HandlerFunc     { return h.postSignIn }
 
 func TestRoutesAll(t *testing.T) {
 	h := &handlersMock{
-		getPing: func(w http.ResponseWriter, r *http.Request, p httprouter.Params) {
+		getPing: func(w http.ResponseWriter, r *http.Request) {
 		},
-		getCurrentUser: func(w http.ResponseWriter, r *http.Request, p httprouter.Params) {
+		getCurrentUser: func(w http.ResponseWriter, r *http.Request) {
 		},
-		postSignIn: func(w http.ResponseWriter, r *http.Request, p httprouter.Params) {
+		postSignIn: func(w http.ResponseWriter, r *http.Request) {
 		},
 	}