wrangler 2.7.0 → 2.8.0

package/src/__tests__/secret.test.ts

@@ -6,7 +6,7 @@ import { mockAccountId, mockApiToken } from "./helpers/mock-account-id";
 import { mockConsoleMethods } from "./helpers/mock-console";
 import { mockConfirm, mockPrompt, clearDialogs } from "./helpers/mock-dialogs";
 import { useMockIsTTY } from "./helpers/mock-istty";
-
+import { mockGetMembershipsFail } from "./helpers/mock-oauth-flow";
 import { useMockStdin } from "./helpers/mock-stdin";
 import { msw } from "./helpers/msw";
 import { runInTempDir } from "./helpers/run-in-tmp";
@@ -21,14 +21,6 @@ function createFetchResult(result: unknown, success = true) {
 	};
 }
 
-export function mockGetMembershipsFail() {
-	msw.use(
-		rest.get("*/memberships", (req, res, ctx) => {
-			return res.once(ctx.json(createFetchResult([], false)));
-		})
-	);
-}
-
 export function mockGetMemberships(
 	accounts: { id: string; account: { id: string; name: string } }[]
 ) {

package/src/__tests__/tail.test.ts

@@ -13,6 +13,7 @@ import type {
 	RequestEvent,
 	ScheduledEvent,
 	AlarmEvent,
+	EmailEvent,
 } from "../tail/createTail";
 import type { RequestInit } from "undici";
 import type WebSocket from "ws";
@@ -404,6 +405,18 @@ describe("tail", () => {
 			expect(std.out).toMatch(deserializeToJson(serializedMessage));
 		});
 
+		it("logs email messages in json format", async () => {
+			const api = mockWebsocketAPIs();
+			await runWrangler("tail test-worker --format json");
+
+			const event = generateMockEmailEvent();
+			const message = generateMockEventMessage({ event });
+			const serializedMessage = serialize(message);
+
+			api.ws.send(serializedMessage);
+			expect(std.out).toMatch(deserializeToJson(serializedMessage));
+		});
+
 		it("logs request messages in pretty format", async () => {
 			const api = mockWebsocketAPIs();
 			await runWrangler("tail test-worker --format pretty");
@@ -473,6 +486,29 @@ describe("tail", () => {
 		      `);
 		});
 
+		it("logs email messages in pretty format", async () => {
+			const api = mockWebsocketAPIs();
+			await runWrangler("tail test-worker --format pretty");
+
+			const event = generateMockEmailEvent();
+			const message = generateMockEventMessage({ event });
+			const serializedMessage = serialize(message);
+
+			api.ws.send(serializedMessage);
+			expect(
+				std.out
+					.replace(
+						new Date(mockEventTimestamp).toLocaleString(),
+						"[mock event timestamp]"
+					)
+					.replace(mockTailExpiration.toISOString(), "[mock expiration date]")
+			).toMatchInlineSnapshot(`
+			        "Successfully created tail, expires at [mock expiration date]
+			        Connected to test-worker, waiting for logs...
+			        Email from:${mockEmailEventFrom} to:${mockEmailEventTo} size:${mockEmailEventSize} @ [mock event timestamp] - Ok"
+		      `);
+		});
+
 		it("should not crash when the tail message has a void event", async () => {
 			const api = mockWebsocketAPIs();
 			await runWrangler("tail test-worker --format pretty");
@@ -634,7 +670,13 @@ function serialize(message: TailEventMessage): WebSocket.RawData {
  * @returns true if `event` is a RequestEvent
  */
 function isRequest(
-	event: ScheduledEvent | RequestEvent | AlarmEvent | undefined | null
+	event:
+		| ScheduledEvent
+		| RequestEvent
+		| AlarmEvent
+		| EmailEvent
+		| undefined
+		| null
 ): event is RequestEvent {
 	return Boolean(event && "request" in event);
 }
@@ -735,6 +777,21 @@ const mockEventTimestamp = 1645454470467;
  */
 const mockEventScheduledTime = new Date(mockEventTimestamp).toISOString();
 
+/**
+ * Default value for email event from
+ */
+const mockEmailEventFrom = "from@example.com";
+
+/**
+ * Default value for email event to
+ */
+const mockEmailEventTo = "to@example.com";
+
+/**
+ * Default value for email event mail size
+ */
+const mockEmailEventSize = 45416;
+
 /**
  * Mock out the API hit during Tail deletion
  *
@@ -903,3 +960,11 @@ function generateMockAlarmEvent(opts?: Partial<AlarmEvent>): AlarmEvent {
 		scheduledTime: opts?.scheduledTime || mockEventScheduledTime,
 	};
 }
+
+function generateMockEmailEvent(opts?: Partial<EmailEvent>): EmailEvent {
+	return {
+		mailFrom: opts?.mailFrom || mockEmailEventFrom,
+		rcptTo: opts?.rcptTo || mockEmailEventTo,
+		rawSize: opts?.rawSize || mockEmailEventSize,
+	};
+}