From c6e3dde3a2eb5cc3971a70966db07c2c88ff9dc6 Mon Sep 17 00:00:00 2001 From: bcoll Date: Fri, 2 Feb 2024 13:08:21 +0000 Subject: [PATCH] test: update format of writing logs message in E2E tests --- packages/wrangler/e2e/dev.test.ts | 6 +++--- packages/wrangler/e2e/helpers/normalize.ts | 10 ++++++---- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/packages/wrangler/e2e/dev.test.ts b/packages/wrangler/e2e/dev.test.ts index ee2782d5fbc9..fa1df8bcf72a 100644 --- a/packages/wrangler/e2e/dev.test.ts +++ b/packages/wrangler/e2e/dev.test.ts @@ -489,14 +489,14 @@ describe("writes debug logs to hidden file", () => { async (session) => { await waitForPortToBeBound(session.port); - await waitUntilOutputContains(session, "🐛 Writing debug logs to"); + await waitUntilOutputContains(session, "Writing logs to"); await setTimeout(1000); // wait a bit to ensure the file is written to disk } ); const filepath = finalA.stdout.match( - /🐛 Writing debug logs to "(.+\.log)"/ + /🪵 {2}Writing logs to "(.+\.log)"/ )?.[1]; assert(filepath); @@ -511,7 +511,7 @@ describe("writes debug logs to hidden file", () => { }); const filepath = finalA.stdout.match( - /🐛 Writing debug logs to "(.+\.log)"/ + /🪵 {2}Writing logs to "(.+\.log)"/ )?.[1]; expect(filepath).toBeUndefined(); diff --git a/packages/wrangler/e2e/helpers/normalize.ts b/packages/wrangler/e2e/helpers/normalize.ts index b16f378b9c7a..b3582e827437 100644 --- a/packages/wrangler/e2e/helpers/normalize.ts +++ b/packages/wrangler/e2e/helpers/normalize.ts @@ -140,10 +140,12 @@ export function normalizeTempDirs(stdout: string): string { * Debug log files are created with a timestamp, so we replace the debug log filepath timestamp with */ export function normalizeDebugLogFilepath(stdout: string): string { - return stdout.replace( - /(🐛 Writing debug logs to ".+wrangler-debug)-.+\.log/, - "$1-.log" - ); + return stdout + .replace(/🪵 {2}Writing logs to ".+\.log"/, '🪵 Writing logs to ""') + .replace( + /🪵 {2}Logs were written to ".+\.log"/, + '🪵 Logs were written to ""' + ); } /**