Migrated a few additional tests

Author: codebien

internal/cmd/cloud_test.go

@@ -148,15 +148,15 @@ func TestCheckCloudLogin(t *testing.T) {
 			conf: cloudapi.Config{
 				Token: null.StringFrom("valid-token"),
 			},
-			wantErr: errStackNotConfigured,
+			wantErr: errUserUnauthenticated,
 		},
 		{
 			name: "zero stack ID returns stack not configured error",
 			conf: cloudapi.Config{
 				Token:   null.StringFrom("valid-token"),
 				StackID: null.IntFrom(0),
 			},
-			wantErr: errStackNotConfigured,
+			wantErr: errUserUnauthenticated,
 		},
 	}
 

internal/cmd/tests/cmd_cloud_run_test.go

@@ -219,7 +219,7 @@ export default function() {};`
 
 		stdout := ts.Stdout.String()
 		t.Log(stdout)
-		assert.Contains(t, stdout, "stack must be configured")
+		assert.Contains(t, stdout, "must first authenticate")
 	})
 }
 
@@ -232,8 +232,8 @@ func makeTestState(tb testing.TB, script string, cliFlags []string, expExitCode
 	require.NoError(tb, fsext.WriteFile(ts.FS, filepath.Join(ts.Cwd, "test.js"), []byte(script), 0o644))
 	ts.CmdArgs = append(append([]string{"k6", "cloud", "run"}, cliFlags...), "test.js")
 	ts.ExpectedExitCode = int(expExitCode)
-	ts.Env["K6_CLOUD_TOKEN"] = "foo"      // doesn't matter, we mock the cloud
-	ts.Env["K6_CLOUD_STACK_ID"] = "1234"  // doesn't matter, we mock the cloud
+	ts.Env["K6_CLOUD_TOKEN"] = "foo"     // doesn't matter, we mock the cloud
+	ts.Env["K6_CLOUD_STACK_ID"] = "1234" // doesn't matter, we mock the cloud
 
 	return ts
 }

internal/cmd/tests/cmd_cloud_test.go

@@ -55,7 +55,7 @@ func runCloudTests(t *testing.T, setupCmd setupCommandFunc) {
 
 		stdout := ts.Stdout.String()
 		t.Log(stdout)
-		assert.Contains(t, stdout, `stack must be configured`)
+		assert.Contains(t, stdout, `must first authenticate`)
 	})
 
 	t.Run("TestCloudLoggedInWithScriptToken", func(t *testing.T) {
@@ -229,10 +229,10 @@ func runCloudTests(t *testing.T, setupCmd setupCommandFunc) {
 		require.NoError(t, fsext.WriteFile(ts.FS, filepath.Join(ts.Cwd, "archive.tar"), data, 0o644))
 
 		ts.CmdArgs = []string{"k6", "cloud", "--verbose", "--log-output=stdout", "archive.tar"}
-		ts.Env["K6_SHOW_CLOUD_LOGS"] = "false"  // no mock for the logs yet
+		ts.Env["K6_SHOW_CLOUD_LOGS"] = "false" // no mock for the logs yet
 		ts.Env["K6_CLOUD_HOST"] = srv.URL
-		ts.Env["K6_CLOUD_TOKEN"] = "foo"        // doesn't matter, we mock the cloud
-		ts.Env["K6_CLOUD_STACK_ID"] = "1234"    // doesn't matter, we mock the cloud
+		ts.Env["K6_CLOUD_TOKEN"] = "foo"     // doesn't matter, we mock the cloud
+		ts.Env["K6_CLOUD_STACK_ID"] = "1234" // doesn't matter, we mock the cloud
 
 		cmd.ExecuteWithGlobalState(ts.GlobalState)
 
@@ -344,11 +344,11 @@ func getSimpleCloudTestState(t *testing.T, script []byte, setupCmd setupCommandF
 	ts := NewGlobalTestState(t)
 	require.NoError(t, fsext.WriteFile(ts.FS, filepath.Join(ts.Cwd, "test.js"), script, 0o644))
 	ts.CmdArgs = setupCmd(cliFlags)
-	ts.Env["K6_SHOW_CLOUD_LOGS"] = "false"  // no mock for the logs yet
+	ts.Env["K6_SHOW_CLOUD_LOGS"] = "false" // no mock for the logs yet
 	ts.Env["K6_CLOUD_HOST"] = srv.URL
-	ts.Env["K6_CLOUD_TOKEN"] = "foo"        // doesn't matter, we mock the cloud
-	ts.Env["K6_CLOUD_STACK_ID"] = "1234"    // doesn't matter, we mock the cloud
-	ts.Env["K6_CLOUD_PROJECT_ID"] = "1234"  // doesn't matter, we mock the cloud
+	ts.Env["K6_CLOUD_TOKEN"] = "foo"       // doesn't matter, we mock the cloud
+	ts.Env["K6_CLOUD_STACK_ID"] = "1234"   // doesn't matter, we mock the cloud
+	ts.Env["K6_CLOUD_PROJECT_ID"] = "1234" // doesn't matter, we mock the cloud
 
 	return ts
 }