Skip to content

Commit fb5a6cd

Browse files
committed
move test to enterprise
1 parent b3f6c78 commit fb5a6cd

File tree

2 files changed

+58
-45
lines changed

2 files changed

+58
-45
lines changed

cli/organizationmembers_test.go

Lines changed: 0 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -35,48 +35,3 @@ func TestListOrganizationMembers(t *testing.T) {
3535
})
3636
}
3737

38-
func TestRemoveOrganizationMembers(t *testing.T) {
39-
t.Parallel()
40-
41-
t.Run("OK", func(t *testing.T) {
42-
t.Parallel()
43-
44-
ownerClient := coderdtest.New(t, &coderdtest.Options{})
45-
owner := coderdtest.CreateFirstUser(t, ownerClient)
46-
orgAdminClient, _ := coderdtest.CreateAnotherUser(t, ownerClient, owner.OrganizationID, rbac.ScopedRoleOrgAdmin(owner.OrganizationID))
47-
_, user := coderdtest.CreateAnotherUser(t, ownerClient, owner.OrganizationID)
48-
49-
ctx := testutil.Context(t, testutil.WaitMedium)
50-
51-
inv, root := clitest.New(t, "organization", "members", "remove", "-O", owner.OrganizationID.String(), user.Username)
52-
clitest.SetupConfig(t, orgAdminClient, root)
53-
54-
buf := new(bytes.Buffer)
55-
inv.Stdout = buf
56-
err := inv.WithContext(ctx).Run()
57-
require.NoError(t, err)
58-
59-
members, err := orgAdminClient.OrganizationMembers(ctx, owner.OrganizationID)
60-
require.NoError(t, err)
61-
62-
require.Len(t, members, 2)
63-
})
64-
65-
t.Run("UserNotExists", func(t *testing.T) {
66-
t.Parallel()
67-
68-
ownerClient := coderdtest.New(t, &coderdtest.Options{})
69-
owner := coderdtest.CreateFirstUser(t, ownerClient)
70-
orgAdminClient, _ := coderdtest.CreateAnotherUser(t, ownerClient, owner.OrganizationID, rbac.ScopedRoleOrgAdmin(owner.OrganizationID))
71-
72-
ctx := testutil.Context(t, testutil.WaitMedium)
73-
74-
inv, root := clitest.New(t, "organization", "members", "remove", "-O", owner.OrganizationID.String(), "random_name")
75-
clitest.SetupConfig(t, orgAdminClient, root)
76-
77-
buf := new(bytes.Buffer)
78-
inv.Stdout = buf
79-
err := inv.WithContext(ctx).Run()
80-
require.ErrorContains(t, err, "must be an existing uuid or username")
81-
})
82-
}

enterprise/cli/organizationmembers_test.go

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,64 @@ import (
1515
"github.com/coder/coder/v2/testutil"
1616
)
1717

18+
func TestRemoveOrganizationMembers(t *testing.T) {
19+
t.Parallel()
20+
21+
t.Run("OK", func(t *testing.T) {
22+
t.Parallel()
23+
dv := coderdtest.DeploymentValues(t)
24+
dv.Experiments = []string{string(codersdk.ExperimentMultiOrganization)}
25+
26+
ownerClient, _ := coderdenttest.New(t, &coderdenttest.Options{
27+
Options: &coderdtest.Options{
28+
DeploymentValues: dv,
29+
},
30+
LicenseOptions: &coderdenttest.LicenseOptions{
31+
Features: license.Features{
32+
codersdk.FeatureMultipleOrganizations: 1,
33+
},
34+
},
35+
})
36+
37+
secondOrganization := coderdenttest.CreateOrganization(t, ownerClient, coderdenttest.CreateOrganizationOptions{})
38+
orgAdminClient, _ := coderdtest.CreateAnotherUser(t, ownerClient, secondOrganization.ID, rbac.ScopedRoleOrgAdmin(secondOrganization.ID))
39+
_, user := coderdtest.CreateAnotherUser(t, ownerClient, secondOrganization.ID)
40+
41+
ctx := testutil.Context(t, testutil.WaitMedium)
42+
43+
inv, root := clitest.New(t, "organization", "members", "remove", "-O", secondOrganization.ID.String(), user.Username)
44+
clitest.SetupConfig(t, orgAdminClient, root)
45+
46+
buf := new(bytes.Buffer)
47+
inv.Stdout = buf
48+
err := inv.WithContext(ctx).Run()
49+
require.NoError(t, err)
50+
51+
members, err := orgAdminClient.OrganizationMembers(ctx, secondOrganization.ID)
52+
require.NoError(t, err)
53+
54+
require.Len(t, members, 2)
55+
})
56+
57+
t.Run("UserNotExists", func(t *testing.T) {
58+
t.Parallel()
59+
60+
ownerClient := coderdtest.New(t, &coderdtest.Options{})
61+
owner := coderdtest.CreateFirstUser(t, ownerClient)
62+
orgAdminClient, _ := coderdtest.CreateAnotherUser(t, ownerClient, owner.OrganizationID, rbac.ScopedRoleOrgAdmin(owner.OrganizationID))
63+
64+
ctx := testutil.Context(t, testutil.WaitMedium)
65+
66+
inv, root := clitest.New(t, "organization", "members", "remove", "-O", owner.OrganizationID.String(), "random_name")
67+
clitest.SetupConfig(t, orgAdminClient, root)
68+
69+
buf := new(bytes.Buffer)
70+
inv.Stdout = buf
71+
err := inv.WithContext(ctx).Run()
72+
require.ErrorContains(t, err, "must be an existing uuid or username")
73+
})
74+
}
75+
1876
func TestEnterpriseListOrganizationMembers(t *testing.T) {
1977
t.Parallel()
2078

0 commit comments

Comments
 (0)