fix tests

sreya · sreya · commit c542f2e6dc4f · 2022-10-25T21:51:48.000Z
diff --git a/enterprise/cli/groupcreate.go b/enterprise/cli/groupcreate.go
@@ -8,6 +8,7 @@ import (
 
 	agpl "github.com/coder/coder/cli"
 	"github.com/coder/coder/cli/cliflag"
+	"github.com/coder/coder/cli/cliui"
 	"github.com/coder/coder/codersdk"
 )
 
@@ -42,7 +43,7 @@ func groupCreate() *cobra.Command {
 				return xerrors.Errorf("create group: %w", err)
 			}
 
-			_, _ = fmt.Fprintf(cmd.OutOrStdout(), "Successfully created group %s", group.Name)
+			_, _ = fmt.Fprintf(cmd.OutOrStdout(), "Successfully created group %s!\n", cliui.Styles.Keyword.Render(group.Name))
 			return nil
 		},
 	}
diff --git a/enterprise/cli/groupcreate_test.go b/enterprise/cli/groupcreate_test.go
@@ -1,12 +1,17 @@
 package cli_test
 
 import (
+	"fmt"
 	"testing"
 
 	"github.com/stretchr/testify/require"
 
 	"github.com/coder/coder/cli/clitest"
+	"github.com/coder/coder/cli/cliui"
 	"github.com/coder/coder/coderd/coderdtest"
+	"github.com/coder/coder/enterprise/cli"
+	"github.com/coder/coder/enterprise/coderd/coderdenttest"
+	"github.com/coder/coder/pty/ptytest"
 )
 
 func TestCreateGroup(t *testing.T) {
@@ -15,22 +20,29 @@ func TestCreateGroup(t *testing.T) {
 	t.Run("OK", func(t *testing.T) {
 		t.Parallel()
 
-		client := coderdtest.New(t, nil)
+		client := coderdenttest.New(t, nil)
 		coderdtest.CreateFirstUser(t, client)
+		_ = coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
+			TemplateRBAC: true,
+		})
 
 		var (
 			groupName = "test"
 			avatarURL = "https://example.com"
 		)
 
-		cmd, root := clitest.New(t, "groups",
+		cmd, root := clitest.NewWithSubcommands(t, cli.EnterpriseSubcommands(), "groups",
 			"create", groupName,
 			"--avatar-url", avatarURL,
 		)
 
+		pty := ptytest.New(t)
+		cmd.SetOut(pty.Output())
 		clitest.SetupConfig(t, client, root)
 
 		err := cmd.Execute()
 		require.NoError(t, err)
+
+		pty.ExpectMatch(fmt.Sprintf("Successfully created group %s!", cliui.Styles.Keyword.Render(groupName)))
 	})
 }
diff --git a/enterprise/cli/groupedit.go b/enterprise/cli/groupedit.go
@@ -23,7 +23,7 @@ func groupEdit() *cobra.Command {
 	)
 	cmd := &cobra.Command{
 		Use:   "edit <name>",
-		Short: "Edit a user group.",
+		Short: "Edit a user group",
 		Args:  cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			var (
diff --git a/enterprise/cli/grouplist.go b/enterprise/cli/grouplist.go
@@ -16,7 +16,7 @@ import (
 func groupList() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "list",
-		Short: "List user groups.",
+		Short: "List user groups",
 		Args:  cobra.NoArgs,
 		RunE: func(cmd *cobra.Command, args []string) error {
 			var (

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ import (`
`8`	`8`
`9`	`9`	`agpl "github.com/coder/coder/cli"`
`10`	`10`	`"github.com/coder/coder/cli/cliflag"`
	`11`	`+ "github.com/coder/coder/cli/cliui"`
`11`	`12`	`"github.com/coder/coder/codersdk"`
`12`	`13`	`)`
`13`	`14`
`@@ -42,7 +43,7 @@ func groupCreate() *cobra.Command {`
`42`	`43`	`return xerrors.Errorf("create group: %w", err)`
`43`	`44`	`}`
`44`	`45`
`45`		`- _, _ = fmt.Fprintf(cmd.OutOrStdout(), "Successfully created group %s", group.Name)`
	`46`	`+ _, _ = fmt.Fprintf(cmd.OutOrStdout(), "Successfully created group %s!\n", cliui.Styles.Keyword.Render(group.Name))`
`46`	`47`	`return nil`
`47`	`48`	`},`
`48`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ func groupEdit() *cobra.Command {`
`23`	`23`	`)`
`24`	`24`	`cmd := &cobra.Command{`
`25`	`25`	`Use: "edit <name>",`
`26`		`- Short: "Edit a user group.",`
	`26`	`+ Short: "Edit a user group",`
`27`	`27`	`Args: cobra.ExactArgs(1),`
`28`	`28`	`RunE: func(cmd *cobra.Command, args []string) error {`
`29`	`29`	`var (`