Skip to content

Commit b2da229

Browse files
johnstcnjohnstcn
committed
fix new linter complaints in userlist_test.go
1 parent e037fae commit b2da229

File tree

1 file changed

+12
-7
lines changed

1 file changed

+12
-7
lines changed

‎cli/userlist_test.go

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import (
1111

1212
"github.com/coder/coder/v2/cli/clitest"
1313
"github.com/coder/coder/v2/coderd/coderdtest"
14+
"github.com/coder/coder/v2/coderd/rbac"
1415
"github.com/coder/coder/v2/codersdk"
1516
"github.com/coder/coder/v2/pty/ptytest"
1617
)
@@ -20,9 +21,10 @@ func TestUserList(t *testing.T) {
2021
t.Run("Table", func(t *testing.T) {
2122
t.Parallel()
2223
client := coderdtest.New(t, nil)
23-
coderdtest.CreateFirstUser(t, client)
24+
admin := coderdtest.CreateFirstUser(t, client)
25+
userAdmin, _ := coderdtest.CreateAnotherUser(t, client, admin.OrganizationID, rbac.RoleUserAdmin())
2426
inv, root := clitest.New(t, "users", "list")
25-
clitest.SetupConfig(t, client, root)
27+
clitest.SetupConfig(t, userAdmin, root)
2628
pty := ptytest.New(t).Attach(inv)
2729
errC := make(chan error)
2830
go func() {
@@ -35,9 +37,10 @@ func TestUserList(t *testing.T) {
3537
t.Parallel()
3638

3739
client := coderdtest.New(t, nil)
38-
coderdtest.CreateFirstUser(t, client)
40+
admin := coderdtest.CreateFirstUser(t, client)
41+
userAdmin, _ := coderdtest.CreateAnotherUser(t, client, admin.OrganizationID, rbac.RoleUserAdmin())
3942
inv, root := clitest.New(t, "users", "list", "-o", "json")
40-
clitest.SetupConfig(t, client, root)
43+
clitest.SetupConfig(t, userAdmin, root)
4144
doneChan := make(chan struct{})
4245

4346
buf := bytes.NewBuffer(nil)
@@ -53,7 +56,7 @@ func TestUserList(t *testing.T) {
5356
var users []codersdk.User
5457
err := json.Unmarshal(buf.Bytes(), &users)
5558
require.NoError(t, err, "unmarshal JSON output")
56-
require.Len(t, users, 1)
59+
require.Len(t, users, 2)
5760
require.Contains(t, users[0].Email, "coder.com")
5861
})
5962
t.Run("NoURLFileErrorHasHelperText", func(t *testing.T) {
@@ -85,9 +88,10 @@ func TestUserShow(t *testing.T) {
8588
t.Parallel()
8689
client := coderdtest.New(t, nil)
8790
admin := coderdtest.CreateFirstUser(t, client)
91+
userAdmin, _ := coderdtest.CreateAnotherUser(t, client, admin.OrganizationID, rbac.RoleUserAdmin())
8892
_, otherUser := coderdtest.CreateAnotherUser(t, client, admin.OrganizationID)
8993
inv, root := clitest.New(t, "users", "show", otherUser.Username)
90-
clitest.SetupConfig(t, client, root)
94+
clitest.SetupConfig(t, userAdmin, root)
9195
doneChan := make(chan struct{})
9296
pty := ptytest.New(t).Attach(inv)
9397
go func() {
@@ -105,11 +109,12 @@ func TestUserShow(t *testing.T) {
105109
ctx := context.Background()
106110
client := coderdtest.New(t, nil)
107111
admin := coderdtest.CreateFirstUser(t, client)
112+
userAdmin, _ := coderdtest.CreateAnotherUser(t, client, admin.OrganizationID, rbac.RoleUserAdmin())
108113
other, _ := coderdtest.CreateAnotherUser(t, client, admin.OrganizationID)
109114
otherUser, err := other.User(ctx, codersdk.Me)
110115
require.NoError(t, err, "fetch other user")
111116
inv, root := clitest.New(t, "users", "show", otherUser.Username, "-o", "json")
112-
clitest.SetupConfig(t, client, root)
117+
clitest.SetupConfig(t, userAdmin, root)
113118
doneChan := make(chan struct{})
114119

115120
buf := bytes.NewBuffer(nil)

0 commit comments

Comments
 (0)