diff --git a/packages/wrangler/e2e/helpers/normalize.ts b/packages/wrangler/e2e/helpers/normalize.ts index 6c0f1bffbe53..3223e51f4882 100644 --- a/packages/wrangler/e2e/helpers/normalize.ts +++ b/packages/wrangler/e2e/helpers/normalize.ts @@ -11,6 +11,7 @@ export function normalizeOutput( removeWorkersDev, removeWorkerPreviewUrl, removeUUID, + removeBinding, normalizeErrorMarkers, replaceByte, stripTrailingWhitespace, @@ -62,12 +63,19 @@ function removeTimestamp(str: string) { .replace(/\d\d\d\d-\d\d-\d\dT\d\d:\d\d:\d\d\.\d+?Z/g, "TIMESTAMP") .replace(/\d\d:\d\d:\d\d/g, "TIMESTAMP"); } + function removeUUID(str: string) { return str.replace( /\w{8}-\w{4}-\w{4}-\w{4}-\w{12}/g, "00000000-0000-0000-0000-000000000000" ); } +function removeBinding(str: string) { + return str.replace( + /\w{8}_\w{4}_\w{4}_\w{4}_\w{12}/g, + "00000000_0000_0000_0000_000000000000" + ); +} /** * Remove the Wrangler version/update check header diff --git a/packages/wrangler/e2e/r2.test.ts b/packages/wrangler/e2e/r2.test.ts index 3529b3061d64..94e5a84565a2 100644 --- a/packages/wrangler/e2e/r2.test.ts +++ b/packages/wrangler/e2e/r2.test.ts @@ -21,7 +21,11 @@ describe("r2", () => { expect(normalize(output.stdout)).toMatchInlineSnapshot(` "Creating bucket 'tmp-e2e-r2-00000000-0000-0000-0000-000000000000'... - ✅ Created bucket 'tmp-e2e-r2-00000000-0000-0000-0000-000000000000' with default storage class of Standard." + ✅ Created bucket 'tmp-e2e-r2-00000000-0000-0000-0000-000000000000' with default storage class of Standard. + Configure your Worker to write objects to this bucket: + [[r2_buckets]] + bucket_name = "tmp-e2e-r2-00000000-0000-0000-0000-000000000000" + binding = "tmp_e2e_r2_00000000_0000_0000_0000_000000000000"" `); });