From 9198dd9a67cea9675d7c25c49f0d01bdbb080489 Mon Sep 17 00:00:00 2001 From: Christian Richter Date: Fri, 16 Jun 2023 11:56:03 +0200 Subject: [PATCH] Fix tests Co-authored-by: Julian Koberg Signed-off-by: Christian Richter --- services/graph/pkg/service/v0/approleassignments_test.go | 6 ++++++ services/graph/pkg/service/v0/users_test.go | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/services/graph/pkg/service/v0/approleassignments_test.go b/services/graph/pkg/service/v0/approleassignments_test.go index b67165c526..7315df703e 100644 --- a/services/graph/pkg/service/v0/approleassignments_test.go +++ b/services/graph/pkg/service/v0/approleassignments_test.go @@ -139,6 +139,12 @@ var _ = Describe("AppRoleAssignments", func() { AccountUuid: user.GetId(), RoleId: "some-appRole-ID", } + roleService.On("ListRoleAssignments", mock.Anything, mock.Anything, mock.Anything).Return(&settings.ListRoleAssignmentsResponse{ + Assignments: []*settingsmsg.UserRoleAssignment{ + userRoleAssignment, + }, + }, nil) + roleService.On("AssignRoleToUser", mock.Anything, mock.Anything, mock.Anything).Return(&settings.AssignRoleToUserResponse{Assignment: userRoleAssignment}, nil) ara := libregraph.NewAppRoleAssignmentWithDefaults() diff --git a/services/graph/pkg/service/v0/users_test.go b/services/graph/pkg/service/v0/users_test.go index 5dbe88f5f7..38ee843499 100644 --- a/services/graph/pkg/service/v0/users_test.go +++ b/services/graph/pkg/service/v0/users_test.go @@ -809,7 +809,7 @@ var _ = Describe("Users", func() { user.SetMail("user@example.com") user.SetId("/users/user") - identityBackend.On("GetUser", mock.Anything, mock.Anything, mock.Anything).Return(&user, nil) + identityBackend.On("GetUser", mock.Anything, mock.Anything, mock.Anything).Return(user, nil) }) It("handles missing userids", func() { @@ -866,7 +866,7 @@ var _ = Describe("Users", func() { data, err := json.Marshal(user) Expect(err).ToNot(HaveOccurred()) - r := httptest.NewRequest(http.MethodPost, "/graph/v1.0/users?$invalid=true", bytes.NewBuffer(data)) + r := httptest.NewRequest(http.MethodPost, "/graph/v1.0/users", bytes.NewBuffer(data)) rctx := chi.NewRouteContext() rctx.URLParams.Add("userID", user.GetId()) r = r.WithContext(context.WithValue(revactx.ContextSetUser(ctx, currentUser), chi.RouteCtxKey, rctx))