fixup tests and devin comments

Author: emily-shen

packages/wrangler/src/__tests__/artifacts.test.ts

@@ -1,3 +1,4 @@
+import { runInTempDir } from "@cloudflare/workers-utils/test-helpers";
 import { http, HttpResponse } from "msw";
 import { afterEach, beforeEach, describe, it, vi } from "vitest";
 import { mockAccountId, mockApiToken } from "./helpers/mock-account-id";
@@ -34,7 +35,7 @@ describe("artifacts", () => {
 		clearDialogs();
 		msw.resetHandlers();
 	});
-
+	runInTempDir();
 	describe("namespaces", () => {
 		it("should show help for namespace commands", async ({ expect }) => {
 			await runWrangler("artifacts namespaces --help");

packages/wrangler/src/__tests__/banner.test.ts

@@ -16,8 +16,7 @@ describe("wrangler banner", () => {
 		expect(std.out).toMatchInlineSnapshot(`
 			"
 			 ⛅️ wrangler x.x.x
-			──────────────────
-			Using profile: testing"
+			──────────────────"
 		`);
 	});
 
@@ -39,8 +38,7 @@ describe("wrangler banner", () => {
 		expect(std.out).toMatchInlineSnapshot(`
 			"
 			 ⛅️ wrangler x.x.x
-			──────────────────
-			Using profile: testing"
+			──────────────────"
 		`);
 	});
 });

packages/wrangler/src/__tests__/containers/registries.test.ts

@@ -1,3 +1,4 @@
+import { runInTempDir } from "@cloudflare/workers-utils/test-helpers";
 import { http, HttpResponse } from "msw";
 import { afterEach, beforeEach, describe, it, vi } from "vitest";
 import { mockAccount } from "../cloudchamber/utils";
@@ -19,6 +20,7 @@ import { runWrangler } from "../helpers/run-wrangler";
 import type { ExpectStatic } from "vitest";
 
 describe("containers registries --help", () => {
+	runInTempDir();
 	const std = mockConsoleMethods();
 
 	it("should help", async ({ expect }) => {
@@ -46,6 +48,7 @@ describe("containers registries --help", () => {
 });
 
 describe("containers registries configure", () => {
+	runInTempDir();
 	const std = mockConsoleMethods();
 	const { setIsTTY } = useMockIsTTY();
 	const cliStd = mockCLIOutput();
@@ -569,6 +572,7 @@ describe("containers registries configure", () => {
 });
 
 describe("containers registries list", () => {
+	runInTempDir();
 	const std = mockConsoleMethods();
 	const cliStd = mockCLIOutput();
 	mockAccountId();
@@ -601,8 +605,7 @@ describe("containers registries list", () => {
 		expect(std.out).toMatchInlineSnapshot(`
 			"
 			 ⛅️ wrangler x.x.x
-			──────────────────
-			Using profile: testing"
+			──────────────────"
 		`);
 		expect(cliStd.stdout).toMatchInlineSnapshot(`
 			"╭ List configured container registries
@@ -636,6 +639,7 @@ describe("containers registries list", () => {
 });
 
 describe("containers registries delete", () => {
+	runInTempDir();
 	const cliStd = mockCLIOutput();
 	const std = mockConsoleMethods();
 	const { setIsTTY } = useMockIsTTY();
@@ -698,7 +702,6 @@ describe("containers registries delete", () => {
 			"
 			 ⛅️ wrangler x.x.x
 			──────────────────
-			Using profile: testing
 			? Are you sure you want to delete the registry credentials for 123456789012.dkr.ecr.us-west-2.amazonaws.com? This action cannot be undone.
 			🤖 Using fallback value in non-interactive context: yes"
 		`);
@@ -837,6 +840,7 @@ describe("containers registries delete", () => {
 });
 
 describe("containers registries credentials", () => {
+	runInTempDir();
 	const { setIsTTY } = useMockIsTTY();
 	const std = mockConsoleMethods();
 	mockAccountId();

packages/wrangler/src/__tests__/profile.test.ts

@@ -20,7 +20,11 @@ import { mockConsoleMethods } from "./helpers/mock-console";
 import { mockConfirm } from "./helpers/mock-dialogs";
 import { useMockIsTTY } from "./helpers/mock-istty";
 import { mockOAuthFlow } from "./helpers/mock-oauth-flow";
-import { msw, mswSuccessOauthHandlers } from "./helpers/msw";
+import {
+	msw,
+	mswSuccessOauthHandlers,
+	mswSuccessUserHandlers,
+} from "./helpers/msw";
 import { runWrangler } from "./helpers/run-wrangler";
 
 describe("Profile", () => {
@@ -51,6 +55,12 @@ describe("Profile", () => {
 	});
 
 	describe("getAuthConfigFilePath", () => {
+		it("should return default.toml when no profile is active", ({ expect }) => {
+			const filePath = getAuthConfigFilePath();
+			expect(filePath).toContain("default.toml");
+			expect(filePath).not.toContain("profiles");
+		});
+
 		it("should return default.toml for the default profile", ({ expect }) => {
 			const filePath = getAuthConfigFilePath("default");
 			expect(filePath).toContain("default.toml");
@@ -66,10 +76,6 @@ describe("Profile", () => {
 	});
 
 	describe("profileExists", () => {
-		it("should always return true for default", ({ expect }) => {
-			expect(profileExists("default")).toBe(true);
-		});
-
 		it("should return false for non-existent profiles", ({ expect }) => {
 			expect(profileExists("nonexistent")).toBe(false);
 		});
@@ -88,8 +94,8 @@ describe("Profile", () => {
 	});
 
 	describe("getActiveProfileName", () => {
-		it("should return default when nothing is configured", ({ expect }) => {
-			expect(getActiveProfileName()).toBe("default");
+		it("should return undefined when nothing is configured", ({ expect }) => {
+			expect(getActiveProfileName()).toBeUndefined();
 		});
 
 		it("should respect WRANGLER_PROFILE env var", ({ expect }) => {
@@ -152,7 +158,6 @@ describe("Profile", () => {
 			});
 			expect(getProfileForDirectory(dir)).toBe("child-profile");
 		});
-
 	});
 
 	describe("CLI commands", () => {
@@ -418,6 +423,65 @@ describe("Profile", () => {
 			});
 		});
 
+		describe("active profile in banner", () => {
+			beforeEach(() => {
+				msw.use(...mswSuccessUserHandlers);
+			});
+
+			it("should print the active profile under the banner", async ({
+				expect,
+			}) => {
+				writeAuthConfigFile(
+					{
+						oauth_token: "token",
+						refresh_token: "refresh",
+						expiration_time: "2030-01-01T00:00:00Z",
+					},
+					"work"
+				);
+				setActiveProfile("work");
+
+				await runWrangler("whoami");
+
+				expect(std.out).toContain("Using profile: work");
+			});
+
+			it("should not print the active profile with --json", async ({
+				expect,
+			}) => {
+				writeAuthConfigFile(
+					{
+						oauth_token: "token",
+						refresh_token: "refresh",
+						expiration_time: "2030-01-01T00:00:00Z",
+					},
+					"work"
+				);
+				setActiveProfile("work");
+
+				await runWrangler("whoami --json");
+
+				expect(std.out).not.toContain("Using profile");
+				const output = JSON.parse(std.out);
+				expect(output.loggedIn).toBe(true);
+				expect(output.profile).toBe("work");
+			});
+
+			it("should not print profile line when using default profile", async ({
+				expect,
+			}) => {
+				writeAuthConfigFile({
+					oauth_token: "token",
+					refresh_token: "refresh",
+					expiration_time: "2030-01-01T00:00:00Z",
+				});
+
+				await runWrangler("whoami");
+
+				expect(std.out).not.toContain("Using profile");
+			});
+		});
+
 		describe("wrangler profiles unset", () => {
 			it("should reset the active profile to default", async ({ expect }) => {
 				writeAuthConfigFile(
@@ -433,7 +497,7 @@ describe("Profile", () => {
 
 				await runWrangler("profiles unset");
 
-				expect(getActiveProfileName()).toBe("default");
+				expect(getActiveProfileName()).toBeUndefined();
 				expect(std.out).toContain(
 					'Switched from profile "work" back to the default profile.'
 				);
@@ -446,6 +510,60 @@ describe("Profile", () => {
 				expect(std.out).toContain("Already using the default profile.");
 			});
 
+			it("should throw when the active profile comes from WRANGLER_PROFILE env var", async ({
+				expect,
+			}) => {
+				vi.stubEnv("WRANGLER_PROFILE", "work");
+				await expect(
+					runWrangler("profiles unset")
+				).rejects.toThrowErrorMatchingInlineSnapshot(
+					`
+					[Error: The active profile "work" is set via the WRANGLER_PROFILE environment variable.
+					]
+				`
+				);
+				vi.unstubAllEnvs();
+			});
+
+			it("should not destroy active.json when WRANGLER_PROFILE is set", async ({
+				expect,
+			}) => {
+				setActiveProfile("personal");
+				vi.stubEnv("WRANGLER_PROFILE", "work");
+
+				await expect(runWrangler("profiles unset")).rejects
+					.toThrowErrorMatchingInlineSnapshot(`
+					[Error: The active profile "work" is set via the WRANGLER_PROFILE environment variable.
+					]
+				`);
+			});
+
+			it("should warn about directory binding but still unset active.json", async ({
+				expect,
+			}) => {
+				writeAuthConfigFile(
+					{
+						oauth_token: "token",
+						refresh_token: "refresh",
+						expiration_time: "2030-01-01T00:00:00Z",
+					},
+					"work"
+				);
+				setActiveProfile("work");
+
+				const dir = process.cwd();
+				writeDirectoryBindings({ [dir]: "work" });
+
+				await runWrangler("profiles unset");
+
+				expect(std.warn).toContain(
+					'This directory is bound to the profile "work"'
+				);
+				expect(std.out).toContain(
+					'Switched from profile "work" back to the default profile.'
+				);
+			});
+
 			it("should remove a directory binding when --dir is provided", async ({
 				expect,
 			}) => {

packages/wrangler/src/__tests__/user.test.ts

@@ -301,9 +301,9 @@ describe("User", () => {
 			await runWrangler("login");
 
 			expect(std.err).toMatchInlineSnapshot(`
-				"[31mX [41;31m[[41;97mERROR[41;31m][0m [1mYou are currently using the auth profile "work[0m
+				"[31mX [41;31m[[41;97mERROR[41;31m][0m [1mYou are currently using the auth profile "work".[0m
 
-				  ". If you want to create a new auth profile, run \`wrangler profiles create <profile name>\`.
+				   If you want to create a new auth profile, run \`wrangler profiles create <profile name>\`.
 				   If you want to switch to an existing auth profile, run \`wrangler profiles set <profile name>\`.
 
 
@@ -321,9 +321,9 @@ describe("User", () => {
 			await runWrangler("login");
 
 			expect(std.err).toMatchInlineSnapshot(`
-				"[31mX [41;31m[[41;97mERROR[41;31m][0m [1mThis directory is bound to the auth profile "work[0m
+				"[31mX [41;31m[[41;97mERROR[41;31m][0m [1mThis directory is bound to the auth profile "work"[0m
 
-				  " If you want to create a new auth profile, run \`wrangler profiles create <profile name>\`.
+				   If you want to create a new auth profile, run \`wrangler profiles create <profile name>\`.
 				   If you want to switch to an existing auth profile, run \`wrangler profiles set <profile name>\`.
 
 

packages/wrangler/src/__tests__/vpc.test.ts

@@ -865,6 +865,7 @@ describe("extractPortFromHostname", () => {
 });
 
 describe("hostname validation", () => {
+	runInTempDir();
 	it("should accept valid hostnames", ({ expect }) => {
 		expect(() => validateHostname("api.example.com")).not.toThrow();
 		expect(() => validateHostname("localhost")).not.toThrow();

packages/wrangler/src/__tests__/whoami.test.ts

@@ -449,7 +449,6 @@ describe("whoami", () => {
 		expect(() => (output = JSON.parse(std.out))).not.toThrow();
 		expect(output).toEqual({
 			loggedIn: true,
-			profile: "default",
 			authType: "OAuth Token",
 			email: "user@example.com",
 			accounts: [

packages/wrangler/src/core/register-yargs-command.ts

@@ -147,9 +147,9 @@ function createHandler(def: InternalCommandDefinition, argv: string[]) {
 				typeof shouldPrintBanner !== "function" || bannerEnabled;
 
 			if (!getWranglerHideBanner()) {
-				if ((def.behaviour?.printActiveProfile ?? true) && shouldPrintBanner) {
+				if ((def.behaviour?.printActiveProfile ?? true) && bannerEnabled) {
 					const activeProfile = getActiveProfileName();
-					if (activeProfile !== "default") {
+					if (activeProfile) {
 						logger.log(`Using profile: ${chalk.blue(activeProfile)}`);
 					}
 				}