From 4daa63a8c9866f261080069c73ddf3260150f2cb Mon Sep 17 00:00:00 2001 From: paoloricciuti Date: Thu, 20 Mar 2025 16:10:13 +0100 Subject: [PATCH] fix: snapshot test runner --- packages/svelte/tests/helpers.js | 2 +- packages/svelte/tests/snapshot/test.ts | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/packages/svelte/tests/helpers.js b/packages/svelte/tests/helpers.js index 684bde3875..5e6e1903d4 100644 --- a/packages/svelte/tests/helpers.js +++ b/packages/svelte/tests/helpers.js @@ -68,7 +68,7 @@ export async function compile_directory( preprocessor, templating_mode ) { - const output_dir = `${cwd}/_output/${generate}${templating_mode === 'functional' ? `-${templating_mode}` : ''}`; + const output_dir = `${cwd}/_output/${generate}${templating_mode === 'functional' ? `-functional` : ''}`; fs.rmSync(output_dir, { recursive: true, force: true }); diff --git a/packages/svelte/tests/snapshot/test.ts b/packages/svelte/tests/snapshot/test.ts index bbcee10d85..ebf1a46daa 100644 --- a/packages/svelte/tests/snapshot/test.ts +++ b/packages/svelte/tests/snapshot/test.ts @@ -25,8 +25,18 @@ const { test, run } = suite(async (config, cwd, templating_mode) = fs.rmSync(`${cwd}/_expected`, { recursive: true, force: true }); fs.cpSync(`${cwd}/_output`, `${cwd}/_expected`, { recursive: true, force: true }); } else { - const actual = globSync('**', { cwd: `${cwd}/_output`, onlyFiles: true }); - const expected = globSync('**', { cwd: `${cwd}/_expected`, onlyFiles: true }); + const actual = globSync('**', { cwd: `${cwd}/_output`, onlyFiles: true }).filter( + // filters out files that might not yet be compiled (functional is executed after string) + (expected) => + expected.startsWith('server/') || + expected.startsWith(`client${templating_mode === 'functional' ? '-functional' : ''}/`) + ); + const expected = globSync('**', { cwd: `${cwd}/_expected`, onlyFiles: true }).filter( + // filters out files that might not yet be compiled (functional is executed after string) + (expected) => + expected.startsWith('server/') || + expected.startsWith(`client${templating_mode === 'functional' ? '-functional' : ''}/`) + ); assert.deepEqual(actual, expected);