chore: add unit test for show

Emyrk · Emyrk · commit e0a2af8d1825 · 2024-05-16T16:53:56.000-05:00
diff --git a/coderd/rbac/rolestore/rolestore.go b/coderd/rbac/rolestore/rolestore.go
@@ -84,7 +84,7 @@ func Expand(ctx context.Context, db database.Store, names []string) (rbac.Roles,
 		for _, dbrole := range dbroles {
 			converted, err := ConvertDBRole(dbrole)
 			if err != nil {
-				return nil, xerrors.Errorf("convert db role %q: %w", dbrole, err)
+				return nil, xerrors.Errorf("convert db role %q: %w", dbrole.Name, err)
 			}
 			roles = append(roles, converted)
 			cache.Store(dbrole.Name, converted)
diff --git a/enterprise/cli/rolescmd_test.go b/enterprise/cli/rolescmd_test.go
@@ -0,0 +1,68 @@
+package cli_test
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/require"
+
+	"github.com/coder/coder/v2/cli/clitest"
+	"github.com/coder/coder/v2/coderd/coderdtest"
+	"github.com/coder/coder/v2/coderd/rbac"
+	"github.com/coder/coder/v2/codersdk"
+	"github.com/coder/coder/v2/enterprise/coderd/coderdenttest"
+	"github.com/coder/coder/v2/enterprise/coderd/license"
+	"github.com/coder/coder/v2/pty/ptytest"
+	"github.com/coder/coder/v2/testutil"
+)
+
+func TestShowRoles(t *testing.T) {
+	t.Parallel()
+
+	t.Run("OK", func(t *testing.T) {
+		t.Parallel()
+
+		dv := coderdtest.DeploymentValues(t)
+		dv.Experiments = []string{string(codersdk.ExperimentCustomRoles)}
+		owner, admin := coderdenttest.New(t, &coderdenttest.Options{
+			Options: &coderdtest.Options{
+				DeploymentValues: dv,
+			},
+			LicenseOptions: &coderdenttest.LicenseOptions{
+				Features: license.Features{
+					codersdk.FeatureCustomRoles: 1,
+				},
+			},
+		})
+
+		// Requires an owner
+		client, _ := coderdtest.CreateAnotherUser(t, owner, admin.OrganizationID, rbac.RoleOwner())
+
+		const expectedRole = "test-role"
+		ctx := testutil.Context(t, testutil.WaitMedium)
+		_, err := client.PatchRole(ctx, codersdk.Role{
+			Name:        expectedRole,
+			DisplayName: "Test Role",
+			SitePermissions: codersdk.CreatePermissions(map[codersdk.RBACResource][]codersdk.RBACAction{
+				codersdk.ResourceWorkspace: {codersdk.ActionRead, codersdk.ActionUpdate},
+			}),
+		})
+		require.NoError(t, err, "create role")
+
+		inv, conf := newCLI(t, "roles", "show", "test-role")
+
+		pty := ptytest.New(t)
+		inv.Stdout = pty.Output()
+		clitest.SetupConfig(t, client, conf)
+
+		err = inv.Run()
+		require.NoError(t, err)
+
+		matches := []string{
+			"test-role", "2 permissions",
+		}
+
+		for _, match := range matches {
+			pty.ExpectMatch(match)
+		}
+	})
+}

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ func Expand(ctx context.Context, db database.Store, names []string) (rbac.Roles,`
`84`	`84`	`for _, dbrole := range dbroles {`
`85`	`85`	`converted, err := ConvertDBRole(dbrole)`
`86`	`86`	`if err != nil {`
`87`		`- return nil, xerrors.Errorf("convert db role %q: %w", dbrole, err)`
	`87`	`+ return nil, xerrors.Errorf("convert db role %q: %w", dbrole.Name, err)`
`88`	`88`	`}`
`89`	`89`	`roles = append(roles, converted)`
`90`	`90`	`cache.Store(dbrole.Name, converted)`