Cleanup tests

cmoog · cmoog · commit 3b70c19d6e8d · 2020-08-06T20:39:24.000-05:00
diff --git a/ci/integration/integration_test.go b/ci/integration/integration_test.go
@@ -8,7 +8,6 @@ import (
 	"time"
 
 	"cdr.dev/coder-cli/ci/tcli"
-	"cdr.dev/coder-cli/internal/entclient"
 	"cdr.dev/slog"
 	"cdr.dev/slog/sloggers/slogtest/assert"
 )
@@ -68,19 +67,6 @@ func TestCoderCLI(t *testing.T) {
 		tcli.Error(),
 	)
 
-	var user entclient.User
-	c.Run(ctx, `coder users ls --output json | jq -c '.[] | select( .username == "charlie")'`).Assert(t,
-		tcli.Success(),
-		stdoutUnmarshalsJSON(&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 --output human | grep charlie").Assert(t,
-		tcli.Success(),
-		tcli.StdoutMatches("charlie"),
-	)
-
 	c.Run(ctx, "coder logout").Assert(t,
 		tcli.Success(),
 	)
diff --git a/ci/integration/users_test.go b/ci/integration/users_test.go
@@ -0,0 +1,56 @@
+package integration
+
+import (
+	"context"
+	"testing"
+	"time"
+
+	"cdr.dev/coder-cli/ci/tcli"
+	"cdr.dev/coder-cli/internal/entclient"
+	"cdr.dev/slog/sloggers/slogtest/assert"
+)
+
+func TestUsers(t *testing.T) {
+	t.Parallel()
+	ctx, cancel := context.WithTimeout(context.Background(), time.Minute*5)
+	defer cancel()
+
+	c, err := tcli.NewContainerRunner(ctx, &tcli.ContainerConfig{
+		Image: "codercom/enterprise-dev",
+		Name:  "coder-cli-tests",
+		BindMounts: map[string]string{
+			binpath: "/bin/coder",
+		},
+	})
+	assert.Success(t, "new run container", err)
+	defer c.Close()
+
+	c.Run(ctx, "which coder").Assert(t,
+		tcli.Success(),
+		tcli.StdoutMatches("/usr/sbin/coder"),
+		tcli.StderrEmpty(),
+	)
+
+	headlessLogin(ctx, t, c)
+
+	var user entclient.User
+	c.Run(ctx, `coder users ls --output json | jq -c '.[] | select( .username == "charlie")'`).Assert(t,
+		tcli.Success(),
+		stdoutUnmarshalsJSON(&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 --output human | grep charlie").Assert(t,
+		tcli.Success(),
+		tcli.StdoutMatches("charlie"),
+	)
+
+	c.Run(ctx, "coder logout").Assert(t,
+		tcli.Success(),
+	)
+
+	c.Run(ctx, "coder users ls").Assert(t,
+		tcli.Error(),
+	)
+}
