update tests for latest refactor

1 files changed, 14 insertions, 7 deletions

diff --git a/internal/authz/middleware_test.go b/internal/authz/middleware_test.go
index 8dbc30f..5795b3f 100644
--- a/internal/authz/middleware_test.go
+++ b/internal/authz/middleware_test.go
@@ -7,11 +7,14 @@ import (
 	"net/http/httptest"
 	"testing"
 
+	"git.ofmax.li/go-git-server/internal/admin"
 	"github.com/casbin/casbin/v2"
 )
 
-func junkTestHandler(rw http.ResponseWriter, req *http.Request) {
-	rw.WriteHeader(http.StatusOK)
+func junkTestHandler() http.HandlerFunc {
+	return func(rw http.ResponseWriter, req *http.Request) {
+		rw.WriteHeader(http.StatusOK)
+	}
 }
 
 func TestAuthentication(t *testing.T) {
@@ -28,7 +31,7 @@ func TestAuthentication(t *testing.T) {
 		token       string
 		tm          TokenMap
 		statusCode  int
-		handler     func(http.ResponseWriter, *http.Request)
+		handler     http.HandlerFunc
 	}{
 		{
 			username:    okUserName,
@@ -51,7 +54,7 @@ func TestAuthentication(t *testing.T) {
 			tm:          tm,
 			statusCode:  http.StatusForbidden,
 			description: "Bad usename",
-			handler:     junkTestHandler,
+			handler:     junkTestHandler(),
 		},
 		{
 			username:    okUserName,
@@ -59,7 +62,7 @@ func TestAuthentication(t *testing.T) {
 			tm:          tm,
 			statusCode:  http.StatusForbidden,
 			description: "Bad token",
-			handler:     junkTestHandler,
+			handler:     junkTestHandler(),
 		},
 	}
 
@@ -82,7 +85,7 @@ func TestAuthentication(t *testing.T) {
 func TestAuthorization(t *testing.T) {
 	t.Log("Starting authorization tests")
 	baseURL := "http://test"
-	enf, err := casbin.NewEnforcer("../../auth_model.ini", "../../testpolicy.csv")
+	enf, err := casbin.NewSyncedEnforcer("../../auth_model.ini", "../../testpolicy.csv")
 	if err != nil {
 		t.Fatalf("Failed to load policies\n%s", err)
 	}
@@ -105,9 +108,13 @@ func TestAuthorization(t *testing.T) {
 			description:    "an unautorized action should yield a 403",
 		},
 	}
+	svcr := &admin.Servicer{
+		enf,
+		&admin.ServerRepos{},
+	}
 	for _, tc := range cases {
 		t.Logf("test case: %s", tc.description)
-		authHandler := Authorization(enf, junkTestHandler)
+		authHandler := Authorization(svcr, junkTestHandler())
 		recorder := httptest.NewRecorder()
 		req := httptest.NewRequest(http.MethodGet, tc.url, nil)
 		ctx := req.Context()