fixup! fixup! Rework usage and descriptions

cmoog · cmoog · commit e1d956895eaa · 2020-07-31T14:50:41.000-05:00
diff --git a/ci/integration/integration_test.go b/ci/integration/integration_test.go
@@ -40,11 +40,10 @@ func TestCoderCLI(t *testing.T) {
 		tcli.StdoutMatches("linux"),
 	)
 
-	c.Run(ctx, "coder help").Assert(t,
+	c.Run(ctx, "coder --help").Assert(t,
 		tcli.Success(),
-		tcli.StderrMatches("Commands:"),
-		tcli.StderrMatches("Usage: coder"),
-		tcli.StdoutEmpty(),
+		tcli.StdoutMatches("COMMANDS:"),
+		tcli.StdoutMatches("USAGE:"),
 	)
 
 	headlessLogin(ctx, t, c)
@@ -53,6 +52,10 @@ func TestCoderCLI(t *testing.T) {
 		tcli.Success(),
 	)
 
+	c.Run(ctx, "coder envs ls").Assert(t,
+		tcli.Success(),
+	)
+
 	c.Run(ctx, "coder urls").Assert(t,
 		tcli.Error(),
 	)
@@ -66,14 +69,14 @@ func TestCoderCLI(t *testing.T) {
 	)
 
 	var user entclient.User
-	c.Run(ctx, `coder users ls -o json | jq -c '.[] | select( .username == "charlie")'`).Assert(t,
+	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 -o human | grep charlie").Assert(t,
+	c.Run(ctx, "coder users ls --output human | grep charlie").Assert(t,
 		tcli.Success(),
 		tcli.StdoutMatches("charlie"),
 	)
@@ -82,7 +85,7 @@ func TestCoderCLI(t *testing.T) {
 		tcli.Success(),
 	)
 
-	c.Run(ctx, "coder envs").Assert(t,
+	c.Run(ctx, "coder envs ls").Assert(t,
 		tcli.Error(),
 	)
 }
diff --git a/ci/integration/secrets_test.go b/ci/integration/secrets_test.go
@@ -36,7 +36,6 @@ func TestSecrets(t *testing.T) {
 
 	c.Run(ctx, "coder secrets create").Assert(t,
 		tcli.Error(),
-		tcli.StdoutEmpty(),
 	)
 
 	// this tests the "Value:" prompt fallback

Original file line number	Diff line number	Diff line change
`@@ -40,11 +40,10 @@ func TestCoderCLI(t *testing.T) {`
`40`	`40`	`tcli.StdoutMatches("linux"),`
`41`	`41`	`)`
`42`	`42`
`43`		`- c.Run(ctx, "coder help").Assert(t,`
	`43`	`+ c.Run(ctx, "coder --help").Assert(t,`
`44`	`44`	`tcli.Success(),`
`45`		`- tcli.StderrMatches("Commands:"),`
`46`		`- tcli.StderrMatches("Usage: coder"),`
`47`		`- tcli.StdoutEmpty(),`
	`45`	`+ tcli.StdoutMatches("COMMANDS:"),`
	`46`	`+ tcli.StdoutMatches("USAGE:"),`
`48`	`47`	`)`
`49`	`48`
`50`	`49`	`headlessLogin(ctx, t, c)`
`@@ -53,6 +52,10 @@ func TestCoderCLI(t *testing.T) {`
`53`	`52`	`tcli.Success(),`
`54`	`53`	`)`
`55`	`54`
	`55`	`+ c.Run(ctx, "coder envs ls").Assert(t,`
	`56`	`+ tcli.Success(),`
	`57`	`+ )`
	`58`	`+`
`56`	`59`	`c.Run(ctx, "coder urls").Assert(t,`
`57`	`60`	`tcli.Error(),`
`58`	`61`	`)`
`@@ -66,14 +69,14 @@ func TestCoderCLI(t *testing.T) {`
`66`	`69`	`)`
`67`	`70`
`68`	`71`	`var user entclient.User`
`69`		- c.Run(ctx, `coder users ls -o json \| jq -c '.[] \| select( .username == "charlie")'`).Assert(t,
	`72`	+ c.Run(ctx, `coder users ls --output json \| jq -c '.[] \| select( .username == "charlie")'`).Assert(t,
`70`	`73`	`tcli.Success(),`
`71`	`74`	`stdoutUnmarshalsJSON(&user),`
`72`	`75`	`)`
`73`	`76`	`assert.Equal(t, "user email is as expected", "charlie@coder.com", user.Email)`
`74`	`77`	`assert.Equal(t, "username is as expected", "Charlie", user.Name)`
`75`	`78`
`76`		`- c.Run(ctx, "coder users ls -o human \| grep charlie").Assert(t,`
	`79`	`+ c.Run(ctx, "coder users ls --output human \| grep charlie").Assert(t,`
`77`	`80`	`tcli.Success(),`
`78`	`81`	`tcli.StdoutMatches("charlie"),`
`79`	`82`	`)`
`@@ -82,7 +85,7 @@ func TestCoderCLI(t *testing.T) {`
`82`	`85`	`tcli.Success(),`
`83`	`86`	`)`
`84`	`87`
`85`		`- c.Run(ctx, "coder envs").Assert(t,`
	`88`	`+ c.Run(ctx, "coder envs ls").Assert(t,`
`86`	`89`	`tcli.Error(),`
`87`	`90`	`)`
`88`	`91`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,6 @@ func TestSecrets(t *testing.T) {`
`36`	`36`
`37`	`37`	`c.Run(ctx, "coder secrets create").Assert(t,`
`38`	`38`	`tcli.Error(),`
`39`		`- tcli.StdoutEmpty(),`
`40`	`39`	`)`
`41`	`40`
`42`	`41`	`// this tests the "Value:" prompt fallback`