fixup! Add ci readme

cmoog · cmoog · commit e26341dc9de8 · 2020-08-07T11:16:00.000-05:00
diff --git a/ci/integration/integration_test.go b/ci/integration/integration_test.go
@@ -2,13 +2,11 @@ package integration
 
 import (
 	"context"
-	"encoding/json"
 	"math/rand"
 	"testing"
 	"time"
 
 	"cdr.dev/coder-cli/ci/tcli"
-	"cdr.dev/slog"
 	"cdr.dev/slog/sloggers/slogtest/assert"
 )
 
@@ -76,14 +74,6 @@ func TestCoderCLI(t *testing.T) {
 	)
 }
 
-func stdoutUnmarshalsJSON(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)
-	}
-}
-
 var seededRand = rand.New(rand.NewSource(time.Now().UnixNano()))
 
 func randString(length int) string {
diff --git a/ci/integration/users_test.go b/ci/integration/users_test.go
@@ -36,7 +36,7 @@ func TestUsers(t *testing.T) {
 	var user entclient.User
 	c.Run(ctx, `coder users ls --output json | jq -c '.[] | select( .username == "charlie")'`).Assert(t,
 		tcli.Success(),
-		stdoutUnmarshalsJSON(&user),
+		tcli.StdoutJSONUnmarshal(&user),
 	)
 	assert.Equal(t, "user email is as expected", "charlie@coder.com", user.Email)
 	assert.Equal(t, "username is as expected", "Charlie", user.Name)
diff --git a/ci/tcli/tcli.go b/ci/tcli/tcli.go
@@ -3,6 +3,7 @@ package tcli
 import (
 	"bytes"
 	"context"
+	"encoding/json"
 	"fmt"
 	"io"
 	"os/exec"
@@ -329,3 +330,21 @@ func DurationGreaterThan(dur time.Duration) Assertion {
 		}
 	}
 }
+
+// StdoutJSONUnmarshal attempts to unmarshal stdout into the given target
+func StdoutJSONUnmarshal(target interface{}) Assertion {
+	return func(t *testing.T, r *CommandResult) {
+		slog.Helper()
+		err := json.Unmarshal(r.Stdout, target)
+		assert.Success(t, "stdout json unmarshals", err)
+	}
+}
+
+// StderrJSONUnmarshal attempts to unmarshal stderr into the given target
+func StderrJSONUnmarshal(target interface{}) Assertion {
+	return func(t *testing.T, r *CommandResult) {
+		slog.Helper()
+		err := json.Unmarshal(r.Stdout, target)
+		assert.Success(t, "stderr json unmarshals", err)
+	}
+}

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ func TestUsers(t *testing.T) {`
`36`	`36`	`var user entclient.User`
`37`	`37`	c.Run(ctx, `coder users ls --output json \| jq -c '.[] \| select( .username == "charlie")'`).Assert(t,
`38`	`38`	`tcli.Success(),`
`39`		`- stdoutUnmarshalsJSON(&user),`
	`39`	`+ tcli.StdoutJSONUnmarshal(&user),`
`40`	`40`	`)`
`41`	`41`	`assert.Equal(t, "user email is as expected", "charlie@coder.com", user.Email)`
`42`	`42`	`assert.Equal(t, "username is as expected", "Charlie", user.Name)`