From e4795cf29039546c99e737ed934a2ab14ee4c974 Mon Sep 17 00:00:00 2001 From: Michal Piechowiak Date: Tue, 22 Apr 2025 13:37:00 +0200 Subject: [PATCH] test: allow cache-status to be either comma or line separated --- tests/e2e/dynamic-cms.test.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/e2e/dynamic-cms.test.ts b/tests/e2e/dynamic-cms.test.ts index ae179c68fc..551935f549 100644 --- a/tests/e2e/dynamic-cms.test.ts +++ b/tests/e2e/dynamic-cms.test.ts @@ -57,8 +57,8 @@ test.describe('Dynamic CMS', () => { expect(response1?.status()).toEqual(404) expect(headers1['cache-control']).toEqual('public,max-age=0,must-revalidate') - expect(headers1['cache-status']).toEqual( - '"Next.js"; fwd=miss, "Netlify Durable"; fwd=uri-miss; stored, "Netlify Edge"; fwd=miss', + expect(headers1['cache-status']).toMatch( + /"Next.js"; fwd=miss\s*(,|\n)\s*"Netlify Durable"; fwd=uri-miss; stored\s*(, |\n)\s*"Netlify Edge"; fwd=miss/, ) expect(headers1['netlify-cache-tag']).toEqual(expectedCacheTag) expect(headers1['netlify-cdn-cache-control']).toMatch( @@ -77,7 +77,7 @@ test.describe('Dynamic CMS', () => { expect(response2?.status()).toEqual(200) expect(headers2['cache-control']).toEqual('public,max-age=0,must-revalidate') expect(headers2['cache-status']).toMatch( - /"Next.js"; hit, "Netlify Durable"; fwd=stale; ttl=[0-9]+; stored, "Netlify Edge"; fwd=(stale|miss)/, + /"Next.js"; hit\s*(,|\n)\s*"Netlify Durable"; fwd=stale; ttl=[0-9]+; stored\s*(,|\n)\s*"Netlify Edge"; fwd=(stale|miss)/, ) expect(headers2['netlify-cache-tag']).toEqual(expectedCacheTag) expect(headers2['netlify-cdn-cache-control']).toMatch( @@ -96,7 +96,7 @@ test.describe('Dynamic CMS', () => { expect(response3?.status()).toEqual(404) expect(headers3['cache-control']).toEqual('public,max-age=0,must-revalidate') expect(headers3['cache-status']).toMatch( - /"Next.js"; fwd=miss, "Netlify Durable"; fwd=stale; ttl=[0-9]+; stored, "Netlify Edge"; fwd=(stale|miss)/, + /"Next.js"; fwd=miss\s*(,|\n)\s*"Netlify Durable"; fwd=stale; ttl=[0-9]+; stored\s*(,|\n)\s*"Netlify Edge"; fwd=(stale|miss)/, ) expect(headers3['netlify-cache-tag']).toEqual(expectedCacheTag) expect(headers3['netlify-cdn-cache-control']).toMatch(