chore: migrate more tests from tcli to in-mem

coder · cmoog · Mar 22, 2021 · Mar 22, 2021 · Mar 22, 2021 · Mar 22, 2021
commit 3238259eaaa515f3e16e35f8dda037466f3647f5
diff --git a/ci/integration/devurls_test.go b/ci/integration/devurls_test.go
diff --git a/ci/integration/images_test.go b/ci/integration/images_test.go
diff --git a/ci/integration/tags_test.go b/ci/integration/tags_test.go
diff --git a/ci/integration/users_test.go b/ci/integration/users_test.go
diff --git a/internal/cmd/cli_test.go b/internal/cmd/cli_test.go
@@ -87,6 +87,11 @@ func (r result) success(t *testing.T) {
 	assert.Success(t, "execute command", r.exitErr)
 }
 
+func (r result) error(t *testing.T) {
+	t.Helper()
+	assert.Error(t, "execute command", r.exitErr)
+}
+
 //nolint
 func (r result) stdoutContains(t *testing.T, substring string) {
 	t.Helper()
@@ -95,7 +100,6 @@ func (r result) stdoutContains(t *testing.T, substring string) {
 	}
 }
 
-//nolint
 func (r result) stdoutUnmarshals(t *testing.T, target interface{}) {
 	t.Helper()
 	err := json.Unmarshal(r.outBuffer.Bytes(), target)
@@ -145,6 +149,7 @@ func execute(t *testing.T, in io.Reader, args ...string) result {
 	cmd.SetIn(in)
 	cmd.SetOut(&outStream)
 	cmd.SetErr(&errStream)
+	clog.SetOutput(&errStream)
 
 	err := cmd.Execute()
 
@@ -154,6 +159,9 @@ func execute(t *testing.T, in io.Reader, args ...string) result {
 		slog.F("args", args),
 		slog.F("execute_error", err),
 	)
+	if err != nil {
+		clog.Log(err)
+	}
 	return result{
 		outBuffer: &outStream,
 		errBuffer: &errStream,

diff --git a/internal/cmd/devurls_test.go b/internal/cmd/devurls_test.go
@@ -0,0 +1,11 @@
+package cmd
+
+import (
+	"testing"
+)
+
+func Test_devurls(t *testing.T) {
+	skipIfNoAuth(t)
+	res := execute(t, nil, "urls", "ls")
+	res.error(t)
+}
diff --git a/internal/cmd/images_test.go b/internal/cmd/images_test.go
@@ -0,0 +1,26 @@
+package cmd
+
+import (
+	"testing"
+
+	"cdr.dev/coder-cli/coder-sdk"
+	"cdr.dev/slog/sloggers/slogtest/assert"
+)
+
+func Test_images(t *testing.T) {
+	res := execute(t, nil, "images", "--help")
+	res.success(t)
+
+	res = execute(t, nil, "images", "ls")
+	res.success(t)
+
+	var images []coder.Image
+	res = execute(t, nil, "images", "ls", "--output=json")
+	res.success(t)
+	res.stdoutUnmarshals(t, &images)
+	assert.True(t, "more than 0 images", len(images) > 0)
+
+	res = execute(t, nil, "images", "ls", "--org=doesntexist")
+	res.error(t)
+	res.stderrContains(t, "org name \"doesntexist\" not found")
+}
diff --git a/internal/cmd/tags_test.go b/internal/cmd/tags_test.go
@@ -0,0 +1,28 @@
+package cmd
+
+import (
+	"testing"
+
+	"cdr.dev/coder-cli/coder-sdk"
+	"cdr.dev/slog/sloggers/slogtest/assert"
+)
+
+func Test_tags(t *testing.T) {
+	t.Skip("TODO: wait for dedicated test API server / DB so we can create an org")
+
+	skipIfNoAuth(t)
+
+	res := execute(t, nil, "tags", "ls")
+	res.error(t)
+
+	// TODO: import image
+
+	res = execute(t, nil, "tags", "ls", "--image=ubuntu", "--org=default")
+	res.success(t)
+
+	var tags []coder.ImageTag
+	res = execute(t, nil, "tags", "ls", "--image=ubuntu", "--org=default", "--output=json")
+	res.success(t)
+	res.stdoutUnmarshals(t, &tags)
+	assert.True(t, "> 0 tags", len(tags) > 0)
+}
diff --git a/internal/cmd/users_test.go b/internal/cmd/users_test.go
@@ -0,0 +1,31 @@
+package cmd
+
+import (
+	"testing"
+
+	"cdr.dev/coder-cli/coder-sdk"
+	"cdr.dev/slog"
+	"cdr.dev/slog/sloggers/slogtest"
+)
+
+func Test_users(t *testing.T) {
+	skipIfNoAuth(t)
+
+	var users []coder.User
+	res := execute(t, nil, "users", "ls", "--output=json")
+	res.success(t)
+	res.stdoutUnmarshals(t, &users)
+	assertAdmin(t, users)
+
+	res = execute(t, nil, "users", "ls", "--output=human")
+	res.success(t)
+}
+
+func assertAdmin(t *testing.T, users []coder.User) {
+	for _, u := range users {
+		if u.Username == "admin" {
+			return
+		}
+	}
+	slogtest.Fatal(t, "did not find admin user", slog.F("users", users))
+}