From dac197992a3a54c2dba6d3516c997aafc74ae4a8 Mon Sep 17 00:00:00 2001 From: dmail Date: Mon, 19 Aug 2024 23:51:50 +0200 Subject: [PATCH] update tests --- .../create_capture_side_effects.js | 8 +++- .../advanced/side_effects_advanced.test.mjs | 1 + .../file_then_throw/file_then_throw.test.mjs | 2 + .../script_module_jsx_error_dev.test.mjs | 12 ++++-- .../js_assertion_error_browsers.test.mjs | 38 +++++++++++-------- .../js_assertion_error_node.test.mjs | 26 ++++++++----- .../js_syntax_error_browsers.test.mjs | 34 ++++++++++------- .../tests/snapshot_execution_side_effects.js | 12 +++++- .../0_chromium/0_chromium.md | 2 +- .../js_export_missing_dev.test.mjs | 12 ++++-- .../0_chromium/0_chromium.md | 2 +- .../js_syntax_error_dev.test.mjs | 12 ++++-- .../0_chromium/0_chromium.md | 2 +- .../errors/js_throw/js_throw_dev.test.mjs | 12 ++++-- tests/snapshot_build_side_effects.js | 4 ++ tests/snapshot_dev_side_effects.js | 4 ++ 16 files changed, 125 insertions(+), 58 deletions(-) diff --git a/packages/independent/snapshot/src/side_effects/create_capture_side_effects.js b/packages/independent/snapshot/src/side_effects/create_capture_side_effects.js index 14245e4f32..3f7707718d 100644 --- a/packages/independent/snapshot/src/side_effects/create_capture_side_effects.js +++ b/packages/independent/snapshot/src/side_effects/create_capture_side_effects.js @@ -4,12 +4,17 @@ import { createReplaceFilesystemWellKnownValues } from "../filesystem_well_known import { filesystemSideEffects } from "./filesystem/filesystem_side_effects.js"; import { logSideEffects } from "./log/log_side_effects.js"; +const executionEffectsDefault = { + catch: true, + return: true, +}; + export const createCaptureSideEffects = ({ sourceFileUrl, logEffects = true, filesystemEffects = true, filesystemActions, - executionEffects = {}, + executionEffects = executionEffectsDefault, rootDirectoryUrl, replaceFilesystemWellKnownValues = createReplaceFilesystemWellKnownValues({ rootDirectoryUrl, @@ -21,6 +26,7 @@ export const createCaptureSideEffects = ({ return: false, }; } + executionEffects = { ...executionEffectsDefault, ...executionEffects }; const detectors = []; if (logEffects) { diff --git a/packages/independent/snapshot/tests/snapshot_side_effects/advanced/side_effects_advanced.test.mjs b/packages/independent/snapshot/tests/snapshot_side_effects/advanced/side_effects_advanced.test.mjs index 9d0d882a82..ab5e281f91 100644 --- a/packages/independent/snapshot/tests/snapshot_side_effects/advanced/side_effects_advanced.test.mjs +++ b/packages/independent/snapshot/tests/snapshot_side_effects/advanced/side_effects_advanced.test.mjs @@ -138,6 +138,7 @@ import { snapshotSideEffects } from "@jsenv/snapshot"; throw new Error("in the end we throw"); }, { + executionEffects: { catch: true }, sideEffectMdFileUrl: new URL( "./output/6_console_and_file.md", import.meta.url, diff --git a/packages/independent/snapshot/tests/snapshot_tests/file_then_throw/file_then_throw.test.mjs b/packages/independent/snapshot/tests/snapshot_tests/file_then_throw/file_then_throw.test.mjs index eb6938af95..79a77d62c4 100644 --- a/packages/independent/snapshot/tests/snapshot_tests/file_then_throw/file_then_throw.test.mjs +++ b/packages/independent/snapshot/tests/snapshot_tests/file_then_throw/file_then_throw.test.mjs @@ -26,6 +26,7 @@ await snapshotTests( }); }, { + executionEffects: { catch: true }, outFilePattern: "./git_ignored/[filename]", }, ); @@ -46,6 +47,7 @@ await snapshotSideEffects( }); }, { + executionEffect: { catch: true }, throwWhenDiff: true, outFilePattern: "./git_ignored/[filename]", }, diff --git a/packages/related/plugin-preact/tests/script_module_jsx_error/script_module_jsx_error_dev.test.mjs b/packages/related/plugin-preact/tests/script_module_jsx_error/script_module_jsx_error_dev.test.mjs index e083fd55e4..47ba09f352 100644 --- a/packages/related/plugin-preact/tests/script_module_jsx_error/script_module_jsx_error_dev.test.mjs +++ b/packages/related/plugin-preact/tests/script_module_jsx_error/script_module_jsx_error_dev.test.mjs @@ -14,6 +14,12 @@ const run = async ({ browserLauncher }) => { }); }; -await snapshotDevSideEffects(import.meta.url, ({ test }) => { - test("0_chromium", () => run({ browserLauncher: chromium })); -}); +await snapshotDevSideEffects( + import.meta.url, + ({ test }) => { + test("0_chromium", () => run({ browserLauncher: chromium })); + }, + { + executionEffects: { catch: true }, + }, +); diff --git a/packages/related/test/tests/execution/js_assertion_error/js_assertion_error_browsers.test.mjs b/packages/related/test/tests/execution/js_assertion_error/js_assertion_error_browsers.test.mjs index df8e1426cd..eff38a199a 100644 --- a/packages/related/test/tests/execution/js_assertion_error/js_assertion_error_browsers.test.mjs +++ b/packages/related/test/tests/execution/js_assertion_error/js_assertion_error_browsers.test.mjs @@ -26,19 +26,25 @@ const run = async ({ runtime }) => { }); }; -await snapshotFileExecutionSideEffects(import.meta.url, async ({ test }) => { - test("0_chromium", () => - run({ - runtime: chromium(), - })); - test("1_firefox", () => - run({ - runtime: firefox({ - disableOnWindowsBecauseFlaky: false, - }), - })); - test("2_webkit", () => - run({ - runtime: webkit(), - })); -}); +await snapshotFileExecutionSideEffects( + import.meta.url, + async ({ test }) => { + test("0_chromium", () => + run({ + runtime: chromium(), + })); + test("1_firefox", () => + run({ + runtime: firefox({ + disableOnWindowsBecauseFlaky: false, + }), + })); + test("2_webkit", () => + run({ + runtime: webkit(), + })); + }, + { + executionEffects: { catch: true }, + }, +); diff --git a/packages/related/test/tests/execution/js_assertion_error/js_assertion_error_node.test.mjs b/packages/related/test/tests/execution/js_assertion_error/js_assertion_error_node.test.mjs index f04faab47f..43650766c8 100644 --- a/packages/related/test/tests/execution/js_assertion_error/js_assertion_error_node.test.mjs +++ b/packages/related/test/tests/execution/js_assertion_error/js_assertion_error_node.test.mjs @@ -11,13 +11,19 @@ const run = async ({ runtime }) => { }); }; -await snapshotFileExecutionSideEffects(import.meta.url, async ({ test }) => { - test("0_worker_thread", () => - run({ - runtime: nodeWorkerThread(), - })); - test("0_child_process", () => - run({ - runtime: nodeChildProcess(), - })); -}); +await snapshotFileExecutionSideEffects( + import.meta.url, + async ({ test }) => { + test("0_worker_thread", () => + run({ + runtime: nodeWorkerThread(), + })); + test("0_child_process", () => + run({ + runtime: nodeChildProcess(), + })); + }, + { + executionEffects: { catch: true }, + }, +); diff --git a/packages/related/test/tests/execution/js_syntax_error/js_syntax_error_browsers.test.mjs b/packages/related/test/tests/execution/js_syntax_error/js_syntax_error_browsers.test.mjs index d4332898a0..0e142d3745 100644 --- a/packages/related/test/tests/execution/js_syntax_error/js_syntax_error_browsers.test.mjs +++ b/packages/related/test/tests/execution/js_syntax_error/js_syntax_error_browsers.test.mjs @@ -19,17 +19,23 @@ const run = async ({ runtime }) => { }); }; -await snapshotFileExecutionSideEffects(import.meta.url, async ({ test }) => { - test("0_chromium", () => - run({ - runtime: chromium(), - })); - test("1_firefox", () => - run({ - runtime: firefox({ disableOnWindowsBecauseFlaky: false }), - })); - test("2_webkit", () => - run({ - runtime: webkit(), - })); -}); +await snapshotFileExecutionSideEffects( + import.meta.url, + async ({ test }) => { + test("0_chromium", () => + run({ + runtime: chromium(), + })); + test("1_firefox", () => + run({ + runtime: firefox({ disableOnWindowsBecauseFlaky: false }), + })); + test("2_webkit", () => + run({ + runtime: webkit(), + })); + }, + { + executionEffects: { catch: true }, + }, +); diff --git a/packages/related/test/tests/snapshot_execution_side_effects.js b/packages/related/test/tests/snapshot_execution_side_effects.js index 66cfc7e824..c48d9e4803 100644 --- a/packages/related/test/tests/snapshot_execution_side_effects.js +++ b/packages/related/test/tests/snapshot_execution_side_effects.js @@ -6,11 +6,15 @@ export const snapshotFileExecutionSideEffects = async ( options = {}, ) => snapshotTests(testFileUrl, fnRegisteringTests, { + ...options, filesystemActions: { "**": "compare", "**/.jsenv/": "undo", }, - ...options, + executionEffects: { + catch: false, + ...options.executionEffects, + }, }); export const snapshotTestPlanSideEffects = async ( @@ -19,6 +23,7 @@ export const snapshotTestPlanSideEffects = async ( options = {}, ) => snapshotTests(testFileUrl, fnRegisteringTests, { + ...options, filesystemActions: { "**": "compare", "**/.jsenv/": "undo", @@ -26,5 +31,8 @@ export const snapshotTestPlanSideEffects = async ( "**/*.gif": "ignore", "**/.coverage/": "ignore", }, - ...options, + executionEffects: { + catch: false, + ...options.executionEffects, + }, }); diff --git a/tests/dev_and_build/errors/js_export_missing/_js_export_missing_dev.test.mjs/0_chromium/0_chromium.md b/tests/dev_and_build/errors/js_export_missing/_js_export_missing_dev.test.mjs/0_chromium/0_chromium.md index 24d31f0e4c..309f57db47 100644 --- a/tests/dev_and_build/errors/js_export_missing/_js_export_missing_dev.test.mjs/0_chromium/0_chromium.md +++ b/tests/dev_and_build/errors/js_export_missing/_js_export_missing_dev.test.mjs/0_chromium/0_chromium.md @@ -1,4 +1,4 @@ -# [0_chromium](../../js_export_missing_dev.test.mjs#L26) +# [0_chromium](../../js_export_missing_dev.test.mjs#L28) ```js run({ browserLauncher: chromium }) diff --git a/tests/dev_and_build/errors/js_export_missing/js_export_missing_dev.test.mjs b/tests/dev_and_build/errors/js_export_missing/js_export_missing_dev.test.mjs index 9d6572c3ca..42276d98e3 100644 --- a/tests/dev_and_build/errors/js_export_missing/js_export_missing_dev.test.mjs +++ b/tests/dev_and_build/errors/js_export_missing/js_export_missing_dev.test.mjs @@ -22,6 +22,12 @@ const run = async () => { }); }; -await snapshotDevSideEffects(import.meta.url, ({ test }) => { - test("0_chromium", () => run({ browserLauncher: chromium })); -}); +await snapshotDevSideEffects( + import.meta.url, + ({ test }) => { + test("0_chromium", () => run({ browserLauncher: chromium })); + }, + { + executionEffects: { catch: true }, + }, +); diff --git a/tests/dev_and_build/errors/js_syntax_error/_js_syntax_error_dev.test.mjs/0_chromium/0_chromium.md b/tests/dev_and_build/errors/js_syntax_error/_js_syntax_error_dev.test.mjs/0_chromium/0_chromium.md index 2c141ca898..3357536e3b 100644 --- a/tests/dev_and_build/errors/js_syntax_error/_js_syntax_error_dev.test.mjs/0_chromium/0_chromium.md +++ b/tests/dev_and_build/errors/js_syntax_error/_js_syntax_error_dev.test.mjs/0_chromium/0_chromium.md @@ -1,4 +1,4 @@ -# [0_chromium](../../js_syntax_error_dev.test.mjs#L26) +# [0_chromium](../../js_syntax_error_dev.test.mjs#L28) ```js run({ browserLauncher: chromium }) diff --git a/tests/dev_and_build/errors/js_syntax_error/js_syntax_error_dev.test.mjs b/tests/dev_and_build/errors/js_syntax_error/js_syntax_error_dev.test.mjs index 7f537b4801..8f930454cf 100644 --- a/tests/dev_and_build/errors/js_syntax_error/js_syntax_error_dev.test.mjs +++ b/tests/dev_and_build/errors/js_syntax_error/js_syntax_error_dev.test.mjs @@ -22,6 +22,12 @@ const run = async () => { }); }; -await snapshotDevSideEffects(import.meta.url, ({ test }) => { - test("0_chromium", () => run({ browserLauncher: chromium })); -}); +await snapshotDevSideEffects( + import.meta.url, + ({ test }) => { + test("0_chromium", () => run({ browserLauncher: chromium })); + }, + { + executionEffects: { catch: true }, + }, +); diff --git a/tests/dev_and_build/errors/js_throw/_js_throw_dev.test.mjs/0_chromium/0_chromium.md b/tests/dev_and_build/errors/js_throw/_js_throw_dev.test.mjs/0_chromium/0_chromium.md index f5ba0f0b49..9da0f16b04 100644 --- a/tests/dev_and_build/errors/js_throw/_js_throw_dev.test.mjs/0_chromium/0_chromium.md +++ b/tests/dev_and_build/errors/js_throw/_js_throw_dev.test.mjs/0_chromium/0_chromium.md @@ -1,4 +1,4 @@ -# [0_chromium](../../js_throw_dev.test.mjs#L26) +# [0_chromium](../../js_throw_dev.test.mjs#L28) ```js run({ browserLauncher: chromium }) diff --git a/tests/dev_and_build/errors/js_throw/js_throw_dev.test.mjs b/tests/dev_and_build/errors/js_throw/js_throw_dev.test.mjs index 9d6572c3ca..42276d98e3 100644 --- a/tests/dev_and_build/errors/js_throw/js_throw_dev.test.mjs +++ b/tests/dev_and_build/errors/js_throw/js_throw_dev.test.mjs @@ -22,6 +22,12 @@ const run = async () => { }); }; -await snapshotDevSideEffects(import.meta.url, ({ test }) => { - test("0_chromium", () => run({ browserLauncher: chromium })); -}); +await snapshotDevSideEffects( + import.meta.url, + ({ test }) => { + test("0_chromium", () => run({ browserLauncher: chromium })); + }, + { + executionEffects: { catch: true }, + }, +); diff --git a/tests/snapshot_build_side_effects.js b/tests/snapshot_build_side_effects.js index 33326d207b..027f888bef 100644 --- a/tests/snapshot_build_side_effects.js +++ b/tests/snapshot_build_side_effects.js @@ -20,4 +20,8 @@ export const snapshotBuildTests = async ( level: "warn", ...(options.logEffects === true ? {} : options.logEffects), }, + executionEffects: { + catch: false, + ...options.executionEffects, + }, }); diff --git a/tests/snapshot_dev_side_effects.js b/tests/snapshot_dev_side_effects.js index 6a7844db27..b823970aa2 100644 --- a/tests/snapshot_dev_side_effects.js +++ b/tests/snapshot_dev_side_effects.js @@ -21,4 +21,8 @@ export const snapshotDevSideEffects = async ( level: "warn", ...(options.logEffects === true ? {} : options.logEffects), }, + executionEffects: { + catch: false, + ...options.executionEffects, + }, });