Skip to content

Commit 71a8937

Browse files
kylecarbskylecarbs
authored
chore: remove CreateAnotherUserWithUser (#6068)
This was not idiomatic Go!
1 parent b81d846 commit 71a8937

22 files changed

+90
-101
lines changed

‎cli/create_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ func TestCreate(t *testing.T) {
8787
_ = coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID)
8888
cmd, root := clitest.New(t, "create", "my-workspace", "-y")
8989

90-
member := coderdtest.CreateAnotherUser(t, client, user.OrganizationID)
90+
member, _ := coderdtest.CreateAnotherUser(t, client, user.OrganizationID)
9191
clitest.SetupConfig(t, member, root)
9292
cmdCtx, done := context.WithTimeout(context.Background(), testutil.WaitLong)
9393
go func() {

‎cli/delete_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ func TestDelete(t *testing.T) {
7777
adminClient := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true})
7878
adminUser := coderdtest.CreateFirstUser(t, adminClient)
7979
orgID := adminUser.OrganizationID
80-
client := coderdtest.CreateAnotherUser(t, adminClient, orgID)
80+
client, _ := coderdtest.CreateAnotherUser(t, adminClient, orgID)
8181
user, err := client.User(context.Background(), codersdk.Me)
8282
require.NoError(t, err)
8383

‎cli/userlist_test.go

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,12 +87,9 @@ func TestUserShow(t *testing.T) {
8787

8888
t.Run("Table", func(t *testing.T) {
8989
t.Parallel()
90-
ctx := context.Background()
9190
client := coderdtest.New(t, nil)
9291
admin := coderdtest.CreateFirstUser(t, client)
93-
other := coderdtest.CreateAnotherUser(t, client, admin.OrganizationID)
94-
otherUser, err := other.User(ctx, codersdk.Me)
95-
require.NoError(t, err, "fetch other user")
92+
_, otherUser := coderdtest.CreateAnotherUser(t, client, admin.OrganizationID)
9693
cmd, root := clitest.New(t, "users", "show", otherUser.Username)
9794
clitest.SetupConfig(t, client, root)
9895
doneChan := make(chan struct{})
@@ -114,7 +111,7 @@ func TestUserShow(t *testing.T) {
114111
ctx := context.Background()
115112
client := coderdtest.New(t, nil)
116113
admin := coderdtest.CreateFirstUser(t, client)
117-
other := coderdtest.CreateAnotherUser(t, client, admin.OrganizationID)
114+
other, _ := coderdtest.CreateAnotherUser(t, client, admin.OrganizationID)
118115
otherUser, err := other.User(ctx, codersdk.Me)
119116
require.NoError(t, err, "fetch other user")
120117
cmd, root := clitest.New(t, "users", "show", otherUser.Username, "-o", "json")

‎cli/userstatus_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ func TestUserStatus(t *testing.T) {
1717
t.Parallel()
1818
client := coderdtest.New(t, nil)
1919
admin := coderdtest.CreateFirstUser(t, client)
20-
other := coderdtest.CreateAnotherUser(t, client, admin.OrganizationID)
20+
other, _ := coderdtest.CreateAnotherUser(t, client, admin.OrganizationID)
2121
otherUser, err := other.User(context.Background(), codersdk.Me)
2222
require.NoError(t, err, "fetch user")
2323

‎coderd/apikey_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ func TestSessionExpiry(t *testing.T) {
137137
// this test it works because we don't copy the value (and we use pointers).
138138
dc.SessionDuration.Value = time.Second
139139

140-
userClient := coderdtest.CreateAnotherUser(t, adminClient, adminUser.OrganizationID)
140+
userClient, _ := coderdtest.CreateAnotherUser(t, adminClient, adminUser.OrganizationID)
141141

142142
// Find the session cookie, and ensure it has the correct expiry.
143143
token := userClient.SessionToken()

‎coderd/authorize_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ func TestCheckPermissions(t *testing.T) {
2424
})
2525
// Create adminClient, member, and org adminClient
2626
adminUser := coderdtest.CreateFirstUser(t, adminClient)
27-
memberClient := coderdtest.CreateAnotherUser(t, adminClient, adminUser.OrganizationID)
27+
memberClient, _ := coderdtest.CreateAnotherUser(t, adminClient, adminUser.OrganizationID)
2828
memberUser, err := memberClient.User(ctx, codersdk.Me)
2929
require.NoError(t, err)
30-
orgAdminClient := coderdtest.CreateAnotherUser(t, adminClient, adminUser.OrganizationID, rbac.RoleOrgAdmin(adminUser.OrganizationID))
30+
orgAdminClient, _ := coderdtest.CreateAnotherUser(t, adminClient, adminUser.OrganizationID, rbac.RoleOrgAdmin(adminUser.OrganizationID))
3131
orgAdminUser, err := orgAdminClient.User(ctx, codersdk.Me)
3232
require.NoError(t, err)
3333

‎coderd/coderdtest/coderdtest.go

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -447,12 +447,7 @@ func CreateFirstUser(t *testing.T, client *codersdk.Client) codersdk.CreateFirst
447447
}
448448

449449
// CreateAnotherUser creates and authenticates a new user.
450-
func CreateAnotherUser(t *testing.T, client *codersdk.Client, organizationID uuid.UUID, roles ...string) *codersdk.Client {
451-
userClient, _ := createAnotherUserRetry(t, client, organizationID, 5, roles...)
452-
return userClient
453-
}
454-
455-
func CreateAnotherUserWithUser(t *testing.T, client *codersdk.Client, organizationID uuid.UUID, roles ...string) (*codersdk.Client, codersdk.User) {
450+
func CreateAnotherUser(t *testing.T, client *codersdk.Client, organizationID uuid.UUID, roles ...string) (*codersdk.Client, codersdk.User) {
456451
return createAnotherUserRetry(t, client, organizationID, 5, roles...)
457452
}
458453

‎coderd/organizations_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ func TestOrganizationByUserAndName(t *testing.T) {
4646
t.Parallel()
4747
client := coderdtest.New(t, nil)
4848
first := coderdtest.CreateFirstUser(t, client)
49-
other := coderdtest.CreateAnotherUser(t, client, first.OrganizationID)
49+
other, _ := coderdtest.CreateAnotherUser(t, client, first.OrganizationID)
5050

5151
ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
5252
defer cancel()

‎coderd/roles_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ func TestListRoles(t *testing.T) {
1919
client := coderdtest.New(t, nil)
2020
// Create admin, member, and org admin
2121
admin := coderdtest.CreateFirstUser(t, client)
22-
member := coderdtest.CreateAnotherUser(t, client, admin.OrganizationID)
23-
orgAdmin := coderdtest.CreateAnotherUser(t, client, admin.OrganizationID, rbac.RoleOrgAdmin(admin.OrganizationID))
22+
member, _ := coderdtest.CreateAnotherUser(t, client, admin.OrganizationID)
23+
orgAdmin, _ := coderdtest.CreateAnotherUser(t, client, admin.OrganizationID, rbac.RoleOrgAdmin(admin.OrganizationID))
2424

2525
ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
2626
t.Cleanup(cancel)

‎coderd/templateversions_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ func TestTemplateVersion(t *testing.T) {
4747

4848
ctx, _ := testutil.Context(t)
4949

50-
client1, _ := coderdtest.CreateAnotherUserWithUser(t, client, user.OrganizationID)
50+
client1, _ := coderdtest.CreateAnotherUser(t, client, user.OrganizationID)
5151

5252
_, err := client1.TemplateVersion(ctx, version.ID)
5353
require.NoError(t, err)

0 commit comments

Comments
 (0)