Fix unit tests

Emyrk · Emyrk · commit e9e4a42736f9 · 2022-08-12T11:43:29.000-05:00
diff --git a/coderd/rbac/builtin_test.go b/coderd/rbac/builtin_test.go
@@ -396,10 +396,13 @@ func TestListRoles(t *testing.T) {
 
 	// If this test is ever failing, just update the list to the roles
 	// expected from the builtin set.
+	// Always use constant strings, as if the names change, we need to write
+	// a SQL migration to change the name on the backend.
 	require.ElementsMatch(t, []string{
 		"admin",
 		"member",
 		"auditor",
+		"template-manager",
 	},
 		siteRoleNames)
 
diff --git a/coderd/roles_test.go b/coderd/roles_test.go
@@ -120,7 +120,7 @@ func TestListRoles(t *testing.T) {
 	require.NoError(t, err, "create org")
 
 	const forbidden = "Forbidden"
-	siteRoles := convertRoles(rbac.RoleAdmin(), "auditor")
+	siteRoles := convertRoles(rbac.RoleAdmin(), "auditor", "template-manager")
 	orgRoles := convertRoles(rbac.RoleOrgAdmin(admin.OrganizationID))
 
 	testCases := []struct {
@@ -131,19 +131,20 @@ func TestListRoles(t *testing.T) {
 		AuthorizedError string
 	}{
 		{
+			// Members cannot assign any roles
 			Name: "MemberListSite",
 			APICall: func(ctx context.Context) ([]codersdk.Role, error) {
 				x, err := member.ListSiteRoles(ctx)
 				return x, err
 			},
-			ExpectedRoles: siteRoles,
+			ExpectedRoles: []codersdk.Role{},
 		},
 		{
 			Name: "OrgMemberListOrg",
 			APICall: func(ctx context.Context) ([]codersdk.Role, error) {
 				return member.ListOrganizationRoles(ctx, admin.OrganizationID)
 			},
-			ExpectedRoles: orgRoles,
+			ExpectedRoles: []codersdk.Role{},
 		},
 		{
 			Name: "NonOrgMemberListOrg",
@@ -158,7 +159,7 @@ func TestListRoles(t *testing.T) {
 			APICall: func(ctx context.Context) ([]codersdk.Role, error) {
 				return orgAdmin.ListSiteRoles(ctx)
 			},
-			ExpectedRoles: siteRoles,
+			ExpectedRoles: []codersdk.Role{},
 		},
 		{
 			Name: "OrgAdminListOrg",
diff --git a/codersdk/roles.go b/codersdk/roles.go
@@ -14,8 +14,7 @@ type Role struct {
 	DisplayName string `json:"display_name"`
 }
 
-// ListSiteRoles lists all available site wide roles.
-// This is not user specific.
+// ListSiteRoles lists all assignable site wide roles.
 func (c *Client) ListSiteRoles(ctx context.Context) ([]Role, error) {
 	res, err := c.Request(ctx, http.MethodGet, "/api/v2/users/roles", nil)
 	if err != nil {
@@ -29,8 +28,7 @@ func (c *Client) ListSiteRoles(ctx context.Context) ([]Role, error) {
 	return roles, json.NewDecoder(res.Body).Decode(&roles)
 }
 
-// ListOrganizationRoles lists all available roles for a given organization.
-// This is not user specific.
+// ListOrganizationRoles lists all assignable roles for a given organization.
 func (c *Client) ListOrganizationRoles(ctx context.Context, org uuid.UUID) ([]Role, error) {
 	res, err := c.Request(ctx, http.MethodGet, fmt.Sprintf("/api/v2/organizations/%s/members/roles", org.String()), nil)
 	if err != nil {
