wrangler 0.0.0-e043479 → 0.0.0-e0621809

package/src/__tests__/logger.test.ts

@@ -0,0 +1,141 @@
+import { logger } from "../logger";
+import { mockConsoleMethods } from "./helpers/mock-console";
+
+describe("logger", () => {
+	const std = mockConsoleMethods();
+
+	it("should add colored markers to error and warning messages", () => {
+		logger.loggerLevel = "debug";
+		logger.debug("This is a debug message");
+		logger.log("This is a log message");
+		logger.warn("This is a warn message");
+		logger.error("This is a error message");
+
+		expect(std.debug).toMatchInlineSnapshot(`"This is a debug message"`);
+		expect(std.out).toMatchInlineSnapshot(`"This is a log message"`);
+		expect(std.warn).toMatchInlineSnapshot(`
+      "▲ [WARNING] This is a warn message
+
+      "
+    `);
+		expect(std.err).toMatchInlineSnapshot(`
+      "X [ERROR] This is a error message
+
+      "
+    `);
+	});
+
+	describe("loggerLevel=debug", () => {
+		it("should render messages that are at or above the log level set in the logger", () => {
+			logger.loggerLevel = "debug";
+			logger.debug("This is a debug message");
+			logger.log("This is a log message");
+			logger.warn("This is a warn message");
+			logger.error("This is a error message");
+
+			expect(std.debug).toMatchInlineSnapshot(`"This is a debug message"`);
+			expect(std.out).toMatchInlineSnapshot(`"This is a log message"`);
+			expect(std.warn).toMatchInlineSnapshot(`
+        "▲ [WARNING] This is a warn message
+
+        "
+      `);
+			expect(std.err).toMatchInlineSnapshot(`
+        "X [ERROR] This is a error message
+
+        "
+      `);
+		});
+	});
+
+	describe("loggerLevel=log", () => {
+		it("should render messages that are at or above the log level set in the logger", () => {
+			logger.loggerLevel = "log";
+			logger.debug("This is a debug message");
+			logger.log("This is a log message");
+			logger.warn("This is a warn message");
+			logger.error("This is a error message");
+
+			expect(std.debug).toMatchInlineSnapshot(`""`);
+			expect(std.out).toMatchInlineSnapshot(`"This is a log message"`);
+			expect(std.warn).toMatchInlineSnapshot(`
+        "▲ [WARNING] This is a warn message
+
+        "
+      `);
+			expect(std.err).toMatchInlineSnapshot(`
+        "X [ERROR] This is a error message
+
+        "
+      `);
+		});
+	});
+
+	describe("loggerLevel=warn", () => {
+		it("should render messages that are at or above the log level set in the logger", () => {
+			logger.loggerLevel = "warn";
+			logger.debug("This is a debug message");
+			logger.log("This is a log message");
+			logger.warn("This is a warn message");
+			logger.error("This is a error message");
+
+			expect(std.debug).toMatchInlineSnapshot(`""`);
+			expect(std.out).toMatchInlineSnapshot(`""`);
+			expect(std.warn).toMatchInlineSnapshot(`
+        "▲ [WARNING] This is a warn message
+
+        "
+      `);
+			expect(std.err).toMatchInlineSnapshot(`
+        "X [ERROR] This is a error message
+
+        "
+      `);
+		});
+	});
+
+	describe("loggerLevel=error", () => {
+		it("should render messages that are at or above the log level set in the logger", () => {
+			logger.loggerLevel = "error";
+			logger.debug("This is a debug message");
+			logger.log("This is a log message");
+			logger.warn("This is a warn message");
+			logger.error("This is a error message");
+
+			expect(std.debug).toMatchInlineSnapshot(`""`);
+			expect(std.out).toMatchInlineSnapshot(`""`);
+			expect(std.warn).toMatchInlineSnapshot(`""`);
+			expect(std.err).toMatchInlineSnapshot(`
+        "X [ERROR] This is a error message
+
+        "
+      `);
+		});
+	});
+
+	describe("loggerLevelFromEnvVar=error", () => {
+		beforeEach(() => {
+			process.env.WRANGLER_LOG = "error";
+		});
+		afterEach(() => {
+			process.env.WRANGLER_LOG = undefined;
+		});
+
+		it("should render messages that are at or above the log level set in the env var", () => {
+			logger.loggerLevel = "error";
+			logger.debug("This is a debug message");
+			logger.log("This is a log message");
+			logger.warn("This is a warn message");
+			logger.error("This is a error message");
+
+			expect(std.debug).toMatchInlineSnapshot(`""`);
+			expect(std.out).toMatchInlineSnapshot(`""`);
+			expect(std.warn).toMatchInlineSnapshot(`""`);
+			expect(std.err).toMatchInlineSnapshot(`
+        "X [ERROR] This is a error message
+
+        "
+      `);
+		});
+	});
+});

package/src/__tests__/logout.test.ts

@@ -1,50 +1,47 @@
-import { existsSync } from "node:fs";
-import os from "node:os";
+import fs from "node:fs";
 import path from "node:path";
-import fetchMock from "jest-fetch-mock";
-import { initialise } from "../user";
+import { rest } from "msw";
+import { getGlobalWranglerConfigPath } from "../global-wrangler-config-path";
+import { USER_AUTH_CONFIG_FILE, writeAuthConfigFile } from "../user";
 import { mockConsoleMethods } from "./helpers/mock-console";
-import { writeUserConfig } from "./helpers/mock-user";
+import { msw } from "./helpers/msw";
 import { runInTempDir } from "./helpers/run-in-tmp";
 import { runWrangler } from "./helpers/run-wrangler";
 
-describe("wrangler", () => {
-  runInTempDir({ homedir: "./home" });
-  const std = mockConsoleMethods();
-
-  describe("logout", () => {
-    it("should exit with a message stating the user is not logged in", async () => {
-      await initialise();
-      await runWrangler("logout");
-      expect(std.out).toMatchInlineSnapshot(`"Not logged in, exiting..."`);
-    });
-
-    it("should logout user that has been properly logged in", async () => {
-      writeUserConfig("some-oauth-tok", "some-refresh-tok");
-
-      // Mock out the response for a request to revoke the auth tokens,
-      // checking the form of the request is as expected.
-      fetchMock.mockResponseOnce(async (req) => {
-        expect(req.url).toEqual("https://dash.cloudflare.com/oauth2/revoke");
-        expect(req.method).toEqual("POST");
-        return "";
-      });
-
-      await initialise();
-      await runWrangler("logout");
-
-      expect(std.out).toMatchInlineSnapshot(`
-        "💁  Wrangler is configured with an OAuth token. The token has been successfully revoked
-        Removing ./home/.wrangler/config/default.toml.. success!"
-      `);
-
-      // Make sure that we made the request to logout.
-      expect(fetchMock).toHaveBeenCalledTimes(1);
-
-      // Make sure that logout removed the config file containing the auth tokens.
-      expect(
-        existsSync(path.join(os.homedir(), ".wrangler/config/default.toml"))
-      ).toBe(false);
-    });
-  });
+describe("logout", () => {
+	runInTempDir();
+	const std = mockConsoleMethods();
+
+	it("should exit with a message stating the user is not logged in", async () => {
+		await runWrangler("logout");
+		expect(std.out).toMatchInlineSnapshot(`"Not logged in, exiting..."`);
+	});
+
+	it("should logout user that has been properly logged in", async () => {
+		writeAuthConfigFile({
+			oauth_token: "some-oauth-tok",
+			refresh_token: "some-refresh-tok",
+		});
+		// Make sure that logout removed the config file containing the auth tokens.
+		const config = path.join(
+			getGlobalWranglerConfigPath(),
+			USER_AUTH_CONFIG_FILE
+		);
+		let counter = 0;
+		msw.use(
+			rest.post("*/oauth2/revoke", (_, response, context) => {
+				// Make sure that we made the request to logout.
+				counter += 1;
+				return response.once(context.status(200), context.text(""));
+			})
+		);
+
+		expect(fs.existsSync(config)).toBeTruthy();
+
+		await runWrangler("logout");
+
+		expect(std.out).toMatchInlineSnapshot(`"Successfully logged out."`);
+		expect(fs.existsSync(config)).toBeFalsy();
+		expect(counter).toBe(1);
+	});
 });