Skip to content
Merged
2 changes: 2 additions & 0 deletions server/src/.mockery.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ packages:
interfaces:
SessionService:
SessionDatabase:
SessionApi:

scrumlr.io/server/sessionrequests:
interfaces:
Expand All @@ -52,6 +53,7 @@ packages:
interfaces:
UserService:
UserDatabase:
UsersApi:

scrumlr.io/server/notes:
interfaces:
Expand Down
139 changes: 0 additions & 139 deletions server/src/api/board_sessions.go

This file was deleted.

29 changes: 24 additions & 5 deletions server/src/api/board_templates_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ import (
"scrumlr.io/server/columntemplates"
"scrumlr.io/server/common"
"scrumlr.io/server/identifiers"
"scrumlr.io/server/serviceinitialize"
"scrumlr.io/server/sessions"
"scrumlr.io/server/users"
)

Expand Down Expand Up @@ -388,11 +390,28 @@ func TestTemplateRoutesMiddlewareIntegration(t *testing.T) {
mockBoardTemplates.EXPECT().Update(mock.Anything, mock.Anything).Return(mockTemplate, nil).Maybe()
mockBoardTemplates.EXPECT().Delete(mock.Anything, mock.Anything).Return(nil).Maybe()

sessionApiMock := sessions.NewMockSessionApi(t)
next := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
w.WriteHeader(http.StatusOK)
})

sessionApiMock.EXPECT().BoardParticipantContext(mock.Anything).Return(next)
sessionApiMock.EXPECT().BoardModeratorContext(mock.Anything).Return(next)
sessionServiceMock := sessions.NewMockSessionService(t)

apiInitializer := serviceinitialize.NewApiInitializer("/")
userApi := apiInitializer.InitializeUserApi(mockUsers, sessionServiceMock, false, false)
routesInitializer := serviceinitialize.NewRoutesInitializer()
userRoutes := routesInitializer.InitializeUserRoutes(userApi, sessionApiMock)
sessionRoutes := routesInitializer.InitializeSessionRoutes(sessionApiMock)

// Use the actual router from router.go with minimal mocked dependencies
r := New(
"/", // basePath
nil, // realtime (not needed for templates)
mockAuth, // auth
s := New(
"/", // basePath
nil, // realtime (not needed for templates)
mockAuth, // auth
userRoutes,
sessionRoutes,
nil, // boards
nil, // columns
nil, // votings
Expand Down Expand Up @@ -439,7 +458,7 @@ func TestTemplateRoutesMiddlewareIntegration(t *testing.T) {
rr := httptest.NewRecorder()

// Execute request
r.ServeHTTP(rr, req)
s.ServeHTTP(rr, req)

// Verify status
assert.Equal(t, tt.expectedStatus, rr.Code, "Expected status %d for %s %s, got %d", tt.expectedStatus, tt.method, tt.path, rr.Code)
Expand Down
Loading
Loading