Add users ls integration tests

cmoog · cmoog · commit ca1f7e6befd5 · 2020-07-29T13:15:42.000-05:00
diff --git a/README.md b/README.md
@@ -17,24 +17,3 @@ Download the latest [release](https://github.com/cdr/coder-cli/releases):
 cd ~/go/bin
 tar -xvf ~/Downloads/coder-cli-linux-amd64.tar.gz
 ```
-
-## Usage
-
-```
-$ coder --help
-Usage: coder [subcommand] [flags]
-
-coder provides a CLI for working with an existing Coder Enterprise installation.
-
-Commands:
-        envs        get a list of active environment
-        login       authenticate this client for future operations
-        logout      remote local authentication credentials (if any)
-        sh          executes a remote command on the environment
-        sync        establish a one way directory sync to a remote environment
-        urls        get all development urls for external access
-        version     print the currently installed CLI version
-        config-ssh  add your Coder Enterprise environments to ~/.ssh/config
-        users       used to interact with user accounts
-
-```
diff --git a/ci/integration/integration_test.go b/ci/integration/integration_test.go
@@ -2,6 +2,7 @@ package integration
 
 import (
 	"context"
+	"encoding/json"
 	"fmt"
 	"os"
 	"os/exec"
@@ -11,6 +12,8 @@ import (
 	"time"
 
 	"cdr.dev/coder-cli/ci/tcli"
+	"cdr.dev/coder-cli/internal/entclient"
+	"cdr.dev/slog"
 	"cdr.dev/slog/sloggers/slogtest/assert"
 )
 
@@ -110,6 +113,19 @@ func TestCoderCLI(t *testing.T) {
 		tcli.Error(),
 	)
 
+	var user entclient.User
+	c.Run(ctx, `coder users ls -o json | jq -c '.[] | select( .username == "charlie")'`).Assert(t,
+		tcli.Success(),
+		jsonUnmarshals(&user),
+	)
+	assert.Equal(t, "user email is as expected", "charlie@coder.com", user.Email)
+	assert.Equal(t, "username is as expected", "Charlie", user.Name)
+
+	c.Run(ctx, "coder users ls -o human | grep charlie").Assert(t,
+		tcli.Success(),
+		tcli.StdoutMatches("charlie"),
+	)
+
 	c.Run(ctx, "coder logout").Assert(t,
 		tcli.Success(),
 	)
@@ -118,3 +134,11 @@ func TestCoderCLI(t *testing.T) {
 		tcli.Error(),
 	)
 }
+
+func jsonUnmarshals(target interface{}) tcli.Assertion {
+	return func(t *testing.T, r *tcli.CommandResult) {
+		slog.Helper()
+		err := json.Unmarshal(r.Stdout, target)
+		assert.Success(t, "json unmarshals", err)
+	}
+}
diff --git a/cmd/coder/users.go b/cmd/coder/users.go
@@ -21,7 +21,7 @@ func (cmd usersCmd) Spec() cli.CommandSpec {
 	return cli.CommandSpec{
 		Name:  "users",
 		Usage: "[subcommand] <flags>",
-		Desc:  "used to interact with user accounts",
+		Desc:  "interact with user accounts",
 	}
 }
 
diff --git a/internal/entclient/users.go b/internal/entclient/users.go
@@ -1,5 +1,6 @@
 package entclient
 
+// Users gets the list of user accounts
 func (c Client) Users() ([]User, error) {
 	var u []User
 	err := c.requestBody("GET", "/api/users", nil, &u)

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ func (cmd usersCmd) Spec() cli.CommandSpec {`
`21`	`21`	`return cli.CommandSpec{`
`22`	`22`	`Name: "users",`
`23`	`23`	`Usage: "[subcommand] <flags>",`
`24`		`- Desc: "used to interact with user accounts",`
	`24`	`+ Desc: "interact with user accounts",`
`25`	`25`	`}`
`26`	`26`	`}`
`27`	`27`