Fix

mtojek · mtojek · commit 8f1ef7b94e0b · 2023-07-27T13:53:04.000+02:00
diff --git a/cli/userstatus_test.go b/cli/userstatus_test.go
@@ -14,14 +14,13 @@ import (
 
 func TestUserStatus(t *testing.T) {
 	t.Parallel()
-	client := coderdtest.New(t, nil)
-	admin := coderdtest.CreateFirstUser(t, client)
-	other, _ := coderdtest.CreateAnotherUser(t, client, admin.OrganizationID)
-	otherUser, err := other.User(context.Background(), codersdk.Me)
-	require.NoError(t, err, "fetch user")
 
 	t.Run("StatusSelf", func(t *testing.T) {
 		t.Parallel()
+
+		client := coderdtest.New(t, nil)
+		coderdtest.CreateFirstUser(t, client)
+
 		inv, root := clitest.New(t, "users", "suspend", "me")
 		clitest.SetupConfig(t, client, root)
 		// Yes to the prompt
@@ -34,13 +33,18 @@ func TestUserStatus(t *testing.T) {
 
 	t.Run("StatusOther", func(t *testing.T) {
 		t.Parallel()
-		require.Equal(t, codersdk.UserStatusActive, otherUser.Status, "start as active")
+
+		client := coderdtest.New(t, nil)
+		admin := coderdtest.CreateFirstUser(t, client)
+		other, _ := coderdtest.CreateAnotherUser(t, client, admin.OrganizationID)
+		otherUser, err := other.User(context.Background(), codersdk.Me)
+		require.NoError(t, err, "fetch user")
 
 		inv, root := clitest.New(t, "users", "suspend", otherUser.Username)
 		clitest.SetupConfig(t, client, root)
 		// Yes to the prompt
 		inv.Stdin = bytes.NewReader([]byte("yes\n"))
-		err := inv.Run()
+		err = inv.Run()
 		require.NoError(t, err, "suspend user")
 
 		// Check the user status
@@ -64,13 +68,18 @@ func TestUserStatus(t *testing.T) {
 
 	t.Run("StatusDormant", func(t *testing.T) {
 		t.Parallel()
-		require.Equal(t, codersdk.UserStatusActive, otherUser.Status, "start as active")
+
+		client := coderdtest.New(t, nil)
+		admin := coderdtest.CreateFirstUser(t, client)
+		other, _ := coderdtest.CreateAnotherUser(t, client, admin.OrganizationID)
+		otherUser, err := other.User(context.Background(), codersdk.Me)
+		require.NoError(t, err, "fetch user")
 
 		inv, root := clitest.New(t, "users", "dormant", otherUser.Username)
 		clitest.SetupConfig(t, client, root)
 		// Yes to the prompt
 		inv.Stdin = bytes.NewReader([]byte("yes\n"))
-		err := inv.Run()
+		err = inv.Run()
 		require.NoError(t, err, "mark as dormant")
 
 		// Check the user status
