internal/cmd/users_test.go: assert CICD user instead of admin

johnstcn · johnstcn · commit 0e63d2f0593e · 2021-08-17T10:56:22.000Z
diff --git a/internal/cmd/update.go b/internal/cmd/update.go
@@ -180,11 +180,9 @@ func (u *updater) Run(ctx context.Context, force bool, coderURLArg string, versi
 
 	// TODO: validate the checksum of the downloaded file. GitHub does not currently provide this information
 	// and we do not generate them yet.
-	var updatedBinaryName string
+	updatedBinaryName := "coder"
 	if u.osF() == "windows" {
 		updatedBinaryName = "coder.exe"
-	} else {
-		updatedBinaryName = "coder"
 	}
 	updatedBinary, err := extractFromArchive(updatedBinaryName, downloadBuf.Bytes())
 	if err != nil {
diff --git a/internal/cmd/users_test.go b/internal/cmd/users_test.go
@@ -16,17 +16,17 @@ func Test_users(t *testing.T) {
 	res := execute(t, nil, "users", "ls", "--output=json")
 	res.success(t)
 	res.stdoutUnmarshals(t, &users)
-	assertAdmin(t, users)
+	assertCICD(t, users)
 
 	res = execute(t, nil, "users", "ls", "--output=human")
 	res.success(t)
 }
 
-func assertAdmin(t *testing.T, users []coder.User) {
+func assertCICD(t *testing.T, users []coder.User) {
 	for _, u := range users {
-		if u.Username == "admin" {
+		if u.Username == "cicd" {
 			return
 		}
 	}
-	slogtest.Fatal(t, "did not find admin user", slog.F("users", users))
+	slogtest.Fatal(t, "did not find cicd user", slog.F("users", users))
 }

Original file line number	Diff line number	Diff line change
`@@ -16,17 +16,17 @@ func Test_users(t *testing.T) {`
`16`	`16`	`res := execute(t, nil, "users", "ls", "--output=json")`
`17`	`17`	`res.success(t)`
`18`	`18`	`res.stdoutUnmarshals(t, &users)`
`19`		`- assertAdmin(t, users)`
	`19`	`+ assertCICD(t, users)`
`20`	`20`
`21`	`21`	`res = execute(t, nil, "users", "ls", "--output=human")`
`22`	`22`	`res.success(t)`
`23`	`23`	`}`
`24`	`24`
`25`		`-func assertAdmin(t *testing.T, users []coder.User) {`
	`25`	`+func assertCICD(t *testing.T, users []coder.User) {`
`26`	`26`	`for _, u := range users {`
`27`		`- if u.Username == "admin" {`
	`27`	`+ if u.Username == "cicd" {`
`28`	`28`	`return`
`29`	`29`	`}`
`30`	`30`	`}`
`31`		`- slogtest.Fatal(t, "did not find admin user", slog.F("users", users))`
	`31`	`+ slogtest.Fatal(t, "did not find cicd user", slog.F("users", users))`
`32`	`32`	`}`