Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitaf7c7cd

Browse files
committed
fix tests
1 parent90b9078 commitaf7c7cd

File tree

5 files changed

+30
-9
lines changed

5 files changed

+30
-9
lines changed

‎coderd/database/queries.sql.go‎

Lines changed: 15 additions & 3 deletions
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

‎coderd/database/queries/organizationmembers.sql‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,12 @@ WHERE
8989
organization_id= @organization_id
9090
ELSE true
9191
END
92+
-- Filter by system type
93+
AND CASE
94+
WHEN @include_system::bool THEN TRUE
95+
ELSE
96+
is_system= false
97+
END
9298
ORDER BY
9399
-- Deterministic and consistent ordering of all users. This is to ensure consistent pagination.
94100
LOWER(username)ASC OFFSET @offset_opt

‎coderd/members.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ func (api *API) listMembers(rw http.ResponseWriter, r *http.Request) {
161161
members,err:=api.Database.OrganizationMembers(ctx, database.OrganizationMembersParams{
162162
OrganizationID:organization.ID,
163163
UserID:uuid.Nil,
164-
IncludeSystem:false,
164+
IncludeSystem:true,
165165
})
166166
ifhttpapi.Is404Error(err) {
167167
httpapi.ResourceNotFound(rw)
@@ -203,6 +203,7 @@ func (api *API) paginatedMembers(rw http.ResponseWriter, r *http.Request) {
203203

204204
paginatedMemberRows,err:=api.Database.PaginatedOrganizationMembers(ctx, database.PaginatedOrganizationMembersParams{
205205
OrganizationID:organization.ID,
206+
IncludeSystem:true,
206207
// #nosec G115 - Pagination limits are small and fit in int32
207208
LimitOpt:int32(paginationParams.Limit),
208209
// #nosec G115 - Pagination offsets are small and fit in int32

‎coderd/members_test.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import (
77
"github.com/stretchr/testify/require"
88

99
"github.com/coder/coder/v2/coderd/coderdtest"
10+
"github.com/coder/coder/v2/coderd/database"
1011
"github.com/coder/coder/v2/coderd/database/db2sdk"
1112
"github.com/coder/coder/v2/coderd/rbac"
1213
"github.com/coder/coder/v2/codersdk"
@@ -62,9 +63,9 @@ func TestListMembers(t *testing.T) {
6263
ctx:=testutil.Context(t,testutil.WaitShort)
6364
members,err:=client.OrganizationMembers(ctx,first.OrganizationID)
6465
require.NoError(t,err)
65-
require.Len(t,members,2)
66+
require.Len(t,members,3)
6667
require.ElementsMatch(t,
67-
[]uuid.UUID{first.UserID,user.ID},
68+
[]uuid.UUID{first.UserID,user.ID,database.PrebuildsSystemUserID},
6869
db2sdk.List(members,onlyIDs))
6970
})
7071
}

‎enterprise/coderd/roles_test.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import (
1111
"github.com/stretchr/testify/require"
1212

1313
"github.com/coder/coder/v2/coderd/coderdtest"
14+
"github.com/coder/coder/v2/coderd/database"
1415
"github.com/coder/coder/v2/coderd/database/db2sdk"
1516
"github.com/coder/coder/v2/coderd/rbac"
1617
"github.com/coder/coder/v2/codersdk"
@@ -360,9 +361,9 @@ func TestCustomOrganizationRole(t *testing.T) {
360361
// Verify members have the custom role
361362
originalMembers,err:=orgAdmin.OrganizationMembers(ctx,first.OrganizationID)
362363
require.NoError(t,err)
363-
require.Len(t,originalMembers,5)// 3 members + org admin + owner
364+
require.Len(t,originalMembers,6)// 3 members + org admin + owner + prebuilds system user
364365
for_,member:=rangeoriginalMembers {
365-
ifmember.UserID==orgAdminUser.ID||member.UserID==first.UserID {
366+
ifmember.UserID==orgAdminUser.ID||member.UserID==first.UserID||member.UserID==database.PrebuildsSystemUserID{
366367
continue
367368
}
368369

@@ -377,7 +378,7 @@ func TestCustomOrganizationRole(t *testing.T) {
377378
// Verify the role was removed from all members
378379
members,err:=orgAdmin.OrganizationMembers(ctx,first.OrganizationID)
379380
require.NoError(t,err)
380-
require.Len(t,members,5)// 3 members + org admin + owner
381+
require.Len(t,members,6)// 3 members + org admin + owner + prebuilds system user
381382
for_,member:=rangemembers {
382383
require.False(t,slices.ContainsFunc(member.Roles,func(role codersdk.SlimRole)bool {
383384
returnrole.Name==customRoleIdentifier.Name

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp