wrangler 0.0.0-e61fba8 → 0.0.0-e665ccc3

package/src/__tests__/logger.test.ts

@@ -1,115 +1,207 @@
-import { logger } from "../logger";
+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(`
+	const std = mockConsoleMethods();
+
+	it("should add colored markers to error and warning messages", () => {
+		const logger = new 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(`
+		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(`
+	});
+
+	describe("loggerLevel=debug", () => {
+		it("should render messages that are at or above the log level set in the logger", () => {
+			const logger = new 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(`
+			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(`
+		});
+	});
+
+	describe("loggerLevel=log", () => {
+		it("should render messages that are at or above the log level set in the logger", () => {
+			const logger = new 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(`
+			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(`
+		});
+	});
+
+	describe("loggerLevel=warn", () => {
+		it("should render messages that are at or above the log level set in the logger", () => {
+			const logger = new 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(`
+			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(`
+		});
+	});
+
+	describe("loggerLevel=error", () => {
+		it("should render messages that are at or above the log level set in the logger", () => {
+			const logger = new 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", () => {
+			const logger = new Logger();
+			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 case-insensitive", () => {
+		beforeEach(() => {
+			process.env.WRANGLER_LOG = "wARn";
+		});
+		afterEach(() => {
+			process.env.WRANGLER_LOG = undefined;
+		});
+
+		it("should render messages that are at or above the log level set in the env var", () => {
+			const logger = new Logger();
+			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("loggerLevelFromEnvVar falls back to log on invalid level", () => {
+		beforeEach(() => {
+			process.env.WRANGLER_LOG = "everything";
+		});
+		afterEach(() => {
+			process.env.WRANGLER_LOG = undefined;
+		});
+
+		it("should render messages that are at or above the log level set in the env var", () => {
+			const logger = new Logger();
+			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(`
+        "Unrecognised WRANGLER_LOG value \\"everything\\", expected \\"none\\" | \\"error\\" | \\"warn\\" | \\"info\\" | \\"log\\" | \\"debug\\", defaulting to \\"log\\"...
+        ▲ [WARNING] This is a warn message
+
+        "
+      `);
+			expect(std.err).toMatchInlineSnapshot(`
+        "X [ERROR] This is a error message
+
+        "
+      `);
+		});
+	});
 });

package/src/__tests__/logout.test.ts

@@ -0,0 +1,47 @@
+import fs from "node:fs";
+import path from "node:path";
+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 { msw } from "./helpers/msw";
+import { runInTempDir } from "./helpers/run-in-tmp";
+import { runWrangler } from "./helpers/run-wrangler";
+
+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);
+	});
+});