diff --git a/packages/svelte/tests/hydration/samples/ignore-mismatched-href/_config.js b/packages/svelte/tests/hydration/samples/ignore-mismatched-href/_config.js index ce81251e5e..5ebdbb2680 100644 --- a/packages/svelte/tests/hydration/samples/ignore-mismatched-href/_config.js +++ b/packages/svelte/tests/hydration/samples/ignore-mismatched-href/_config.js @@ -11,5 +11,9 @@ export default test({ test(assert, target) { assert.equal(target.querySelector('a')?.getAttribute('href'), '/bar'); - } + }, + + errors: [ + 'Detected a href attribute value change during hydration. This will not be repaired during hydration, the href value that came from the server will be used. Related element:' + ] }); diff --git a/packages/svelte/tests/hydration/test.ts b/packages/svelte/tests/hydration/test.ts index 6884504718..9002f56d51 100644 --- a/packages/svelte/tests/hydration/test.ts +++ b/packages/svelte/tests/hydration/test.ts @@ -32,6 +32,7 @@ interface HydrationTest extends BaseTest { ) => void | Promise; before_test?: () => void; after_test?: () => void; + errors?: any[]; } function read(path: string): string | void { @@ -65,6 +66,7 @@ const { test, run } = suite(async (config, cwd) => { const snapshot = config.snapshot ? config.snapshot(target) : {}; const error = console.error; + const errors: any[] = []; let got_hydration_error = false; console.error = (message: any) => { if (typeof message === 'string' && message.startsWith('ERR_SVELTE_HYDRATION_MISMATCH')) { @@ -73,7 +75,7 @@ const { test, run } = suite(async (config, cwd) => { error(message); } } else { - error(message); + errors.push(message); } }; @@ -85,12 +87,19 @@ const { test, run } = suite(async (config, cwd) => { }); console.error = error; + if (config.expect_hydration_error) { assert.ok(got_hydration_error, 'Expected hydration error'); } else { assert.ok(!got_hydration_error, 'Unexpected hydration error'); } + if (config.errors) { + assert.deepEqual(errors, config.errors); + } else if (errors.length) { + throw new Error(`Unexpected errors: ${errors.join('\n')}`); + } + const expected = read(`${cwd}/_expected.html`) ?? rendered.html; assert_html_equal(target.innerHTML, expected); diff --git a/packages/svelte/tests/runtime-browser/test.ts b/packages/svelte/tests/runtime-browser/test.ts index b2df361aa5..d58f7e78cd 100644 --- a/packages/svelte/tests/runtime-browser/test.ts +++ b/packages/svelte/tests/runtime-browser/test.ts @@ -14,7 +14,6 @@ let browser: import('@playwright/test').Browser; beforeAll(async () => { browser = await chromium.launch(); - console.log('[runtime-browser] Launched browser'); }, 20000); afterAll(async () => { diff --git a/packages/svelte/tests/runtime-legacy/samples/binding-this-multiple/_config.js b/packages/svelte/tests/runtime-legacy/samples/binding-this-multiple/_config.js index 07356ad6fd..88b0ff31e3 100644 --- a/packages/svelte/tests/runtime-legacy/samples/binding-this-multiple/_config.js +++ b/packages/svelte/tests/runtime-legacy/samples/binding-this-multiple/_config.js @@ -2,11 +2,11 @@ import { flushSync } from 'svelte'; import { test } from '../../test'; export default test({ - test({ assert, component, target }) { + test({ assert, target, logs }) { const [b1, b2, b3] = target.querySelectorAll('button'); const first_h1 = target.querySelector('h1'); - assert.deepEqual(component.log, [undefined, first_h1]); + assert.deepEqual(logs, [undefined, first_h1]); flushSync(() => { b3.click(); @@ -14,12 +14,12 @@ export default test({ const third_h1 = target.querySelector('h1'); - assert.deepEqual(component.log, [undefined, first_h1, third_h1]); + assert.deepEqual(logs, [undefined, first_h1, third_h1]); flushSync(() => { b1.click(); }); - assert.deepEqual(component.log, [undefined, first_h1, third_h1, target.querySelector('h1')]); + assert.deepEqual(logs, [undefined, first_h1, third_h1, target.querySelector('h1')]); } }); diff --git a/packages/svelte/tests/runtime-legacy/samples/binding-this-multiple/main.svelte b/packages/svelte/tests/runtime-legacy/samples/binding-this-multiple/main.svelte index bde2158c51..2fb062c2ee 100644 --- a/packages/svelte/tests/runtime-legacy/samples/binding-this-multiple/main.svelte +++ b/packages/svelte/tests/runtime-legacy/samples/binding-this-multiple/main.svelte @@ -1,9 +1,8 @@
diff --git a/packages/svelte/tests/runtime-legacy/samples/component-nested-deep/_config.js b/packages/svelte/tests/runtime-legacy/samples/component-nested-deep/_config.js index e61d8d7b38..da6b9c0442 100644 --- a/packages/svelte/tests/runtime-legacy/samples/component-nested-deep/_config.js +++ b/packages/svelte/tests/runtime-legacy/samples/component-nested-deep/_config.js @@ -4,5 +4,7 @@ import { unmount } from 'svelte'; export default test({ test({ component }) { unmount(component.l1); - } + }, + + warnings: ['Tried to unmount a component that was not mounted.'] }); diff --git a/packages/svelte/tests/runtime-legacy/samples/component-slot-context-props-each-nested/Nested.svelte b/packages/svelte/tests/runtime-legacy/samples/component-slot-context-props-each-nested/Nested.svelte index fab3ae1890..d6e214a926 100644 --- a/packages/svelte/tests/runtime-legacy/samples/component-slot-context-props-each-nested/Nested.svelte +++ b/packages/svelte/tests/runtime-legacy/samples/component-slot-context-props-each-nested/Nested.svelte @@ -1,14 +1,14 @@ {#each items as item (item)} {#each keys as key (key)} setKey(key, value, item)} /> {/each} -{/each} \ No newline at end of file +{/each} diff --git a/packages/svelte/tests/runtime-legacy/samples/component-slot-context-props-each-nested/_config.js b/packages/svelte/tests/runtime-legacy/samples/component-slot-context-props-each-nested/_config.js index 4633776a1f..563efe099a 100644 --- a/packages/svelte/tests/runtime-legacy/samples/component-slot-context-props-each-nested/_config.js +++ b/packages/svelte/tests/runtime-legacy/samples/component-slot-context-props-each-nested/_config.js @@ -7,25 +7,26 @@ export default test({ `, - async test({ assert, target, window, component }) { + + async test({ assert, target, window, logs }) { const [btn1, btn2, btn3, btn4] = target.querySelectorAll('button'); const click = new window.MouseEvent('click', { bubbles: true }); await btn1.dispatchEvent(click); - assert.deepEqual(component.log, ['setKey(a, value-a-c, c)']); + assert.deepEqual(logs, ['setKey(a, value-a-c, c)']); await btn2.dispatchEvent(click); - assert.deepEqual(component.log, ['setKey(a, value-a-c, c)', 'setKey(b, value-b-c, c)']); + assert.deepEqual(logs, ['setKey(a, value-a-c, c)', 'setKey(b, value-b-c, c)']); await btn3.dispatchEvent(click); - assert.deepEqual(component.log, [ + assert.deepEqual(logs, [ 'setKey(a, value-a-c, c)', 'setKey(b, value-b-c, c)', 'setKey(a, value-a-d, d)' ]); await btn4.dispatchEvent(click); - assert.deepEqual(component.log, [ + assert.deepEqual(logs, [ 'setKey(a, value-a-c, c)', 'setKey(b, value-b-c, c)', 'setKey(a, value-a-d, d)', diff --git a/packages/svelte/tests/runtime-legacy/samples/component-slot-context-props-each-nested/main.svelte b/packages/svelte/tests/runtime-legacy/samples/component-slot-context-props-each-nested/main.svelte index 7feb55aaf6..187b4167d5 100644 --- a/packages/svelte/tests/runtime-legacy/samples/component-slot-context-props-each-nested/main.svelte +++ b/packages/svelte/tests/runtime-legacy/samples/component-slot-context-props-each-nested/main.svelte @@ -1,8 +1,7 @@ - + - \ No newline at end of file + diff --git a/packages/svelte/tests/runtime-legacy/samples/component-slot-context-props-each/Nested.svelte b/packages/svelte/tests/runtime-legacy/samples/component-slot-context-props-each/Nested.svelte index a29ffe0376..f356bca079 100644 --- a/packages/svelte/tests/runtime-legacy/samples/component-slot-context-props-each/Nested.svelte +++ b/packages/svelte/tests/runtime-legacy/samples/component-slot-context-props-each/Nested.svelte @@ -1,11 +1,11 @@ {#each keys as key (key)} setKey(key, value)} /> -{/each} \ No newline at end of file +{/each} diff --git a/packages/svelte/tests/runtime-legacy/samples/component-slot-context-props-each/_config.js b/packages/svelte/tests/runtime-legacy/samples/component-slot-context-props-each/_config.js index 008089edc3..7a3eec4eeb 100644 --- a/packages/svelte/tests/runtime-legacy/samples/component-slot-context-props-each/_config.js +++ b/packages/svelte/tests/runtime-legacy/samples/component-slot-context-props-each/_config.js @@ -5,14 +5,15 @@ export default test({ `, - async test({ assert, target, window, component }) { + + async test({ assert, target, window, logs }) { const [btn1, btn2] = target.querySelectorAll('button'); const click = new window.MouseEvent('click', { bubbles: true }); await btn1.dispatchEvent(click); - assert.deepEqual(component.log, ['setKey(a, value-a)']); + assert.deepEqual(logs, ['setKey(a, value-a)']); await btn2.dispatchEvent(click); - assert.deepEqual(component.log, ['setKey(a, value-a)', 'setKey(b, value-b)']); + assert.deepEqual(logs, ['setKey(a, value-a)', 'setKey(b, value-b)']); } }); diff --git a/packages/svelte/tests/runtime-legacy/samples/component-slot-context-props-each/main.svelte b/packages/svelte/tests/runtime-legacy/samples/component-slot-context-props-each/main.svelte index 7dc17b4c95..777ad5a0ee 100644 --- a/packages/svelte/tests/runtime-legacy/samples/component-slot-context-props-each/main.svelte +++ b/packages/svelte/tests/runtime-legacy/samples/component-slot-context-props-each/main.svelte @@ -1,8 +1,7 @@ - + - \ No newline at end of file + diff --git a/packages/svelte/tests/runtime-legacy/samples/component-slot-context-props-let/Inner.svelte b/packages/svelte/tests/runtime-legacy/samples/component-slot-context-props-let/Inner.svelte index 6beaabbb68..41673867d2 100644 --- a/packages/svelte/tests/runtime-legacy/samples/component-slot-context-props-let/Inner.svelte +++ b/packages/svelte/tests/runtime-legacy/samples/component-slot-context-props-let/Inner.svelte @@ -1,9 +1,8 @@ - \ No newline at end of file + diff --git a/packages/svelte/tests/runtime-legacy/samples/component-slot-context-props-let/Nested.svelte b/packages/svelte/tests/runtime-legacy/samples/component-slot-context-props-let/Nested.svelte index 97c44c5145..4e63d7f3fc 100644 --- a/packages/svelte/tests/runtime-legacy/samples/component-slot-context-props-let/Nested.svelte +++ b/packages/svelte/tests/runtime-legacy/samples/component-slot-context-props-let/Nested.svelte @@ -1,8 +1,7 @@ - + set(key, value)} /> - \ No newline at end of file + diff --git a/packages/svelte/tests/runtime-legacy/samples/component-slot-context-props-let/_config.js b/packages/svelte/tests/runtime-legacy/samples/component-slot-context-props-let/_config.js index 008089edc3..7a3eec4eeb 100644 --- a/packages/svelte/tests/runtime-legacy/samples/component-slot-context-props-let/_config.js +++ b/packages/svelte/tests/runtime-legacy/samples/component-slot-context-props-let/_config.js @@ -5,14 +5,15 @@ export default test({ `, - async test({ assert, target, window, component }) { + + async test({ assert, target, window, logs }) { const [btn1, btn2] = target.querySelectorAll('button'); const click = new window.MouseEvent('click', { bubbles: true }); await btn1.dispatchEvent(click); - assert.deepEqual(component.log, ['setKey(a, value-a)']); + assert.deepEqual(logs, ['setKey(a, value-a)']); await btn2.dispatchEvent(click); - assert.deepEqual(component.log, ['setKey(a, value-a)', 'setKey(b, value-b)']); + assert.deepEqual(logs, ['setKey(a, value-a)', 'setKey(b, value-b)']); } }); diff --git a/packages/svelte/tests/runtime-legacy/samples/component-slot-context-props-let/main.svelte b/packages/svelte/tests/runtime-legacy/samples/component-slot-context-props-let/main.svelte index a061f73b3a..777ad5a0ee 100644 --- a/packages/svelte/tests/runtime-legacy/samples/component-slot-context-props-let/main.svelte +++ b/packages/svelte/tests/runtime-legacy/samples/component-slot-context-props-let/main.svelte @@ -1,8 +1,7 @@ - + diff --git a/packages/svelte/tests/runtime-legacy/samples/destroy-twice/_config.js b/packages/svelte/tests/runtime-legacy/samples/destroy-twice/_config.js index 4fe9fbaf45..bfdf090cbd 100644 --- a/packages/svelte/tests/runtime-legacy/samples/destroy-twice/_config.js +++ b/packages/svelte/tests/runtime-legacy/samples/destroy-twice/_config.js @@ -5,5 +5,10 @@ export default test({ test({ component }) { unmount(component); unmount(component); - } + }, + + warnings: [ + 'Tried to unmount a component that was not mounted.', + 'Tried to unmount a component that was not mounted.' + ] }); diff --git a/packages/svelte/tests/runtime-legacy/samples/empty-component-destroy/Empty.svelte b/packages/svelte/tests/runtime-legacy/samples/empty-component-destroy/Empty.svelte index 616839ee0e..1708640d08 100644 --- a/packages/svelte/tests/runtime-legacy/samples/empty-component-destroy/Empty.svelte +++ b/packages/svelte/tests/runtime-legacy/samples/empty-component-destroy/Empty.svelte @@ -1,6 +1,6 @@ - + diff --git a/packages/svelte/tests/runtime-legacy/samples/event-handler-mutation-scope/_config.js b/packages/svelte/tests/runtime-legacy/samples/event-handler-mutation-scope/_config.js index 96e5edba1f..825ffc73ef 100644 --- a/packages/svelte/tests/runtime-legacy/samples/event-handler-mutation-scope/_config.js +++ b/packages/svelte/tests/runtime-legacy/samples/event-handler-mutation-scope/_config.js @@ -2,7 +2,7 @@ import { flushSync } from 'svelte'; import { ok, test } from '../../test'; export default test({ - test({ assert, component, target, window }) { + test({ assert, logs, target }) { const button = target.querySelector('button'); ok(button); @@ -10,12 +10,12 @@ export default test({ button.click(); }); - assert.deepEqual(component.log, ['1 - 1']); + assert.deepEqual(logs, ['1 - 1']); flushSync(() => { button.click(); }); - assert.deepEqual(component.log, ['1 - 1', '2 - 2']); + assert.deepEqual(logs, ['1 - 1', '2 - 2']); } }); diff --git a/packages/svelte/tests/runtime-legacy/samples/event-handler-mutation-scope/main.svelte b/packages/svelte/tests/runtime-legacy/samples/event-handler-mutation-scope/main.svelte index b7b9f3da0c..4ef9bf62bc 100644 --- a/packages/svelte/tests/runtime-legacy/samples/event-handler-mutation-scope/main.svelte +++ b/packages/svelte/tests/runtime-legacy/samples/event-handler-mutation-scope/main.svelte @@ -1,5 +1,4 @@ diff --git a/packages/svelte/tests/runtime-legacy/samples/lifecycle-render-afterUpdate2/Child.svelte b/packages/svelte/tests/runtime-legacy/samples/lifecycle-render-afterUpdate2/Child.svelte index 29a201e16c..50fb461cb3 100644 --- a/packages/svelte/tests/runtime-legacy/samples/lifecycle-render-afterUpdate2/Child.svelte +++ b/packages/svelte/tests/runtime-legacy/samples/lifecycle-render-afterUpdate2/Child.svelte @@ -1,24 +1,23 @@ diff --git a/packages/svelte/tests/runtime-legacy/samples/lifecycle-render-afterUpdate2/_config.js b/packages/svelte/tests/runtime-legacy/samples/lifecycle-render-afterUpdate2/_config.js index 4050d2ef03..1309ef8a24 100644 --- a/packages/svelte/tests/runtime-legacy/samples/lifecycle-render-afterUpdate2/_config.js +++ b/packages/svelte/tests/runtime-legacy/samples/lifecycle-render-afterUpdate2/_config.js @@ -1,13 +1,8 @@ import { flushSync } from 'svelte'; -import { log } from './log.js'; import { test, ok } from '../../test'; export default test({ - before_test: () => { - log.length = 0; - }, - - test({ assert, target }) { + test({ assert, target, logs }) { const [button1, button2] = target.querySelectorAll('button'); ok(button1); ok(button2); @@ -18,7 +13,7 @@ export default test({ button2.click(); flushSync(); - assert.deepEqual(log, [ + assert.deepEqual(logs, [ 'before', 'before 0, 0', 'after', diff --git a/packages/svelte/tests/runtime-legacy/samples/lifecycle-render-afterUpdate2/log.js b/packages/svelte/tests/runtime-legacy/samples/lifecycle-render-afterUpdate2/log.js deleted file mode 100644 index a119176880..0000000000 --- a/packages/svelte/tests/runtime-legacy/samples/lifecycle-render-afterUpdate2/log.js +++ /dev/null @@ -1,2 +0,0 @@ -/** @type {string[]} */ -export const log = []; diff --git a/packages/svelte/tests/runtime-legacy/samples/lifecycle-render-beforeUpdate/Child.svelte b/packages/svelte/tests/runtime-legacy/samples/lifecycle-render-beforeUpdate/Child.svelte index af01095d95..0c43f7cc29 100644 --- a/packages/svelte/tests/runtime-legacy/samples/lifecycle-render-beforeUpdate/Child.svelte +++ b/packages/svelte/tests/runtime-legacy/samples/lifecycle-render-beforeUpdate/Child.svelte @@ -1,7 +1,6 @@

welcome, dan

diff --git a/packages/svelte/tests/runtime-legacy/samples/lifecycle-render-beforeUpdate/_config.js b/packages/svelte/tests/runtime-legacy/samples/lifecycle-render-beforeUpdate/_config.js index a723026b8d..98eb7716fb 100644 --- a/packages/svelte/tests/runtime-legacy/samples/lifecycle-render-beforeUpdate/_config.js +++ b/packages/svelte/tests/runtime-legacy/samples/lifecycle-render-beforeUpdate/_config.js @@ -2,11 +2,11 @@ import { test } from '../../test'; import { flushSync } from 'svelte'; export default test({ - async test({ assert, target, component }) { + async test({ assert, target, logs }) { const input = /** @type {HTMLInputElement} */ (target.querySelector('input')); assert.equal(input?.value, 'rich'); - assert.deepEqual(component.log, []); + assert.deepEqual(logs, []); const inputEvent = new window.InputEvent('input'); input.value = 'dan'; @@ -14,15 +14,15 @@ export default test({ flushSync(); - assert.deepEqual(component.log, ['name in child: dan']); + assert.deepEqual(logs, ['name in child: dan']); - component.log.length = 0; + logs.length = 0; input.value = 'da'; await input.dispatchEvent(inputEvent); flushSync(); - assert.deepEqual(component.log, []); + assert.deepEqual(logs, []); } }); diff --git a/packages/svelte/tests/runtime-legacy/samples/lifecycle-render-beforeUpdate/main.svelte b/packages/svelte/tests/runtime-legacy/samples/lifecycle-render-beforeUpdate/main.svelte index 0793bb45d0..d63945bbc7 100644 --- a/packages/svelte/tests/runtime-legacy/samples/lifecycle-render-beforeUpdate/main.svelte +++ b/packages/svelte/tests/runtime-legacy/samples/lifecycle-render-beforeUpdate/main.svelte @@ -2,8 +2,6 @@ import { beforeUpdate } from 'svelte'; import Child from './Child.svelte'; - export let log = []; - let name = 'rich'; let allowed = false; @@ -16,5 +14,5 @@ {#if allowed} - + {/if} diff --git a/packages/svelte/tests/runtime-legacy/samples/reactive-assignment-prevent-loop/_config.js b/packages/svelte/tests/runtime-legacy/samples/reactive-assignment-prevent-loop/_config.js index 35619e3a0a..7c15475384 100644 --- a/packages/svelte/tests/runtime-legacy/samples/reactive-assignment-prevent-loop/_config.js +++ b/packages/svelte/tests/runtime-legacy/samples/reactive-assignment-prevent-loop/_config.js @@ -1,21 +1,16 @@ import { flushSync } from 'svelte'; import { test } from '../../test'; -import { log } from './log.js'; export default test({ html: '', - before_test() { - log.length = 0; - }, - - test({ assert, target }) { - assert.deepEqual(log, [2, 1]); + test({ assert, target, logs }) { + assert.deepEqual(logs, [2, 1]); const button = target.querySelector('button'); flushSync(() => button?.click()); - assert.deepEqual(log, [2, 1, 2, 1]); + assert.deepEqual(logs, [2, 1, 2, 1]); assert.htmlEqual(target.innerHTML, ''); } diff --git a/packages/svelte/tests/runtime-legacy/samples/reactive-assignment-prevent-loop/log.js b/packages/svelte/tests/runtime-legacy/samples/reactive-assignment-prevent-loop/log.js deleted file mode 100644 index d3df521f4d..0000000000 --- a/packages/svelte/tests/runtime-legacy/samples/reactive-assignment-prevent-loop/log.js +++ /dev/null @@ -1,2 +0,0 @@ -/** @type {any[]} */ -export const log = []; diff --git a/packages/svelte/tests/runtime-legacy/samples/reactive-assignment-prevent-loop/main.svelte b/packages/svelte/tests/runtime-legacy/samples/reactive-assignment-prevent-loop/main.svelte index c65c992b0c..50b91246ff 100644 --- a/packages/svelte/tests/runtime-legacy/samples/reactive-assignment-prevent-loop/main.svelte +++ b/packages/svelte/tests/runtime-legacy/samples/reactive-assignment-prevent-loop/main.svelte @@ -1,6 +1,4 @@ diff --git a/packages/svelte/tests/runtime-legacy/shared.ts b/packages/svelte/tests/runtime-legacy/shared.ts index a0d00ec1c5..039cf64eb0 100644 --- a/packages/svelte/tests/runtime-legacy/shared.ts +++ b/packages/svelte/tests/runtime-legacy/shared.ts @@ -1,7 +1,6 @@ import * as fs from 'node:fs'; import { setImmediate } from 'node:timers/promises'; import glob from 'tiny-glob/sync.js'; -import * as $ from 'svelte/internal/client'; import { createClassComponent } from 'svelte/legacy'; import { flushSync } from 'svelte'; import { render } from 'svelte/server'; @@ -56,6 +55,8 @@ export interface RuntimeTest = Record void | Promise; test_ssr?: (args: { assert: Assert }) => void | Promise; accessors?: boolean; @@ -151,6 +152,36 @@ async function run_test_variant( ) { let unintended_error = false; + // eslint-disable-next-line no-console + const { log, warn } = console; + + let logs: string[] = []; + let warnings: string[] = []; + + { + // use some crude static analysis to determine if logs/warnings are intercepted. + // we do this instead of using getters on the `test` parameters so that we can + // squelch logs in SSR tests while printing temporary logs in other cases + let str = config.test?.toString() ?? ''; + let n = 0; + let i = 0; + while (i < str.length) { + if (str[i] === '(') n++; + if (str[i] === ')' && --n === 0) break; + i++; + } + + if (str.slice(0, i).includes('logs')) { + // eslint-disable-next-line no-console + console.log = (...args) => logs.push(...args); + } + + if (str.slice(0, i).includes('warnings') || config.warnings) { + // eslint-disable-next-line no-console + console.warn = (...args) => warnings.push(...args); + } + } + try { unhandled_rejection = null; @@ -237,15 +268,9 @@ async function run_test_variant( }); } } else { - config.before_test?.(); + logs.length = warnings.length = 0; - const warnings: string[] = []; - // eslint-disable-next-line no-console - const warn = console.warn; - // eslint-disable-next-line no-console - console.warn = (warning) => { - warnings.push(warning); - }; + config.before_test?.(); // eslint-disable-next-line no-console const error = console.error; @@ -266,8 +291,6 @@ async function run_test_variant( hydrate: variant === 'hydrate' }); - // eslint-disable-next-line no-console - console.warn = warn; // eslint-disable-next-line no-console console.error = error; @@ -276,13 +299,6 @@ async function run_test_variant( assert.fail('Expected a runtime error'); } - if (config.warnings) { - assert.deepEqual(warnings, config.warnings); - } else if (warnings.length) { - unintended_error = true; - assert.fail('Received unexpected warnings'); - } - if (config.html) { flushSync(); assert_html_equal_with_options(target.innerHTML, config.html, { @@ -309,7 +325,9 @@ async function run_test_variant( snapshot, window, raf, - compileOptions + compileOptions, + logs, + warnings }); } @@ -319,6 +337,15 @@ async function run_test_variant( } } finally { instance.$destroy(); + + if (config.warnings) { + assert.deepEqual(warnings, config.warnings); + } else if (warnings.length && console.warn === warn) { + unintended_error = true; + warn.apply(console, warnings); + assert.fail('Received unexpected warnings'); + } + assert_html_equal( target.innerHTML, '', @@ -341,6 +368,9 @@ async function run_test_variant( throw err; } } finally { + console.log = log; + console.warn = warn; + config.after_test?.(); // Free up the microtask queue diff --git a/packages/svelte/tests/runtime-runes/samples/action-context/_config.js b/packages/svelte/tests/runtime-runes/samples/action-context/_config.js index 87e9842d9a..b23e88901a 100644 --- a/packages/svelte/tests/runtime-runes/samples/action-context/_config.js +++ b/packages/svelte/tests/runtime-runes/samples/action-context/_config.js @@ -1,22 +1,17 @@ import { ok, test } from '../../test'; -import { flushSync, tick } from 'svelte'; -import { log } from './log.js'; +import { flushSync } from 'svelte'; export default test({ html: ``, - before_test() { - log.length = 0; - }, - - async test({ assert, target }) { + async test({ assert, target, logs }) { const btn = target.querySelector('button'); ok(btn); flushSync(() => btn.click()); - assert.deepEqual(log, ['update', 0, 1]); + assert.deepEqual(logs, ['update', 0, 1]); flushSync(() => btn.click()); - assert.deepEqual(log, ['update', 0, 1, 'destroy', 1]); + assert.deepEqual(logs, ['update', 0, 1, 'destroy', 1]); } }); diff --git a/packages/svelte/tests/runtime-runes/samples/action-context/log.js b/packages/svelte/tests/runtime-runes/samples/action-context/log.js deleted file mode 100644 index d3df521f4d..0000000000 --- a/packages/svelte/tests/runtime-runes/samples/action-context/log.js +++ /dev/null @@ -1,2 +0,0 @@ -/** @type {any[]} */ -export const log = []; diff --git a/packages/svelte/tests/runtime-runes/samples/action-context/main.svelte b/packages/svelte/tests/runtime-runes/samples/action-context/main.svelte index ef8f7894cc..fe3e317038 100644 --- a/packages/svelte/tests/runtime-runes/samples/action-context/main.svelte +++ b/packages/svelte/tests/runtime-runes/samples/action-context/main.svelte @@ -1,6 +1,4 @@ diff --git a/packages/svelte/tests/runtime-runes/samples/action-state-arg-deep/_config.js b/packages/svelte/tests/runtime-runes/samples/action-state-arg-deep/_config.js index c263855bec..3bf9aa66d6 100644 --- a/packages/svelte/tests/runtime-runes/samples/action-state-arg-deep/_config.js +++ b/packages/svelte/tests/runtime-runes/samples/action-state-arg-deep/_config.js @@ -1,15 +1,10 @@ import { test } from '../../test'; -import { flushSync, tick } from 'svelte'; -import { log } from './log.js'; +import { flushSync } from 'svelte'; export default test({ - before_test() { - log.length = 0; - }, - html: `
{"text":"initial"}
`, - async test({ assert, target }) { + async test({ assert, target, logs }) { const [btn1, btn2] = target.querySelectorAll('button'); flushSync(() => { @@ -30,7 +25,7 @@ export default test({ `
{"text":"updated"}
` ); - assert.deepEqual(log, [ + assert.deepEqual(logs, [ 'action $effect: ', { buttonClicked: 0 }, 'action $effect: ', diff --git a/packages/svelte/tests/runtime-runes/samples/action-state-arg-deep/log.js b/packages/svelte/tests/runtime-runes/samples/action-state-arg-deep/log.js deleted file mode 100644 index d3df521f4d..0000000000 --- a/packages/svelte/tests/runtime-runes/samples/action-state-arg-deep/log.js +++ /dev/null @@ -1,2 +0,0 @@ -/** @type {any[]} */ -export const log = []; diff --git a/packages/svelte/tests/runtime-runes/samples/before-update-in-legacy-child/Child.svelte b/packages/svelte/tests/runtime-runes/samples/before-update-in-legacy-child/Child.svelte index 9841295830..2a2dea8220 100644 --- a/packages/svelte/tests/runtime-runes/samples/before-update-in-legacy-child/Child.svelte +++ b/packages/svelte/tests/runtime-runes/samples/before-update-in-legacy-child/Child.svelte @@ -2,11 +2,10 @@ diff --git a/packages/svelte/tests/runtime-runes/samples/before-update-in-legacy-child/_config.js b/packages/svelte/tests/runtime-runes/samples/before-update-in-legacy-child/_config.js index aa42c2a2d6..8d4d63254d 100644 --- a/packages/svelte/tests/runtime-runes/samples/before-update-in-legacy-child/_config.js +++ b/packages/svelte/tests/runtime-runes/samples/before-update-in-legacy-child/_config.js @@ -1,20 +1,15 @@ import { flushSync } from 'svelte'; import { test } from '../../test'; -import { logs } from './logs.js'; export default test({ html: ``, - test({ assert, target }) { + test({ assert, target, logs }) { const btn = target.querySelector('button'); flushSync(() => btn?.click()); assert.htmlEqual(target.innerHTML, ``); assert.deepEqual(logs, ['changed', 'changed']); - }, - - after_test() { - logs.length = 0; } }); diff --git a/packages/svelte/tests/runtime-runes/samples/before-update-in-legacy-child/logs.js b/packages/svelte/tests/runtime-runes/samples/before-update-in-legacy-child/logs.js deleted file mode 100644 index 8c8a1318cb..0000000000 --- a/packages/svelte/tests/runtime-runes/samples/before-update-in-legacy-child/logs.js +++ /dev/null @@ -1,2 +0,0 @@ -/** @type {any[]} */ -export const logs = []; diff --git a/packages/svelte/tests/runtime-runes/samples/bind-this-proxy/_config.js b/packages/svelte/tests/runtime-runes/samples/bind-this-proxy/_config.js index e075b5a588..c07f8d05a4 100644 --- a/packages/svelte/tests/runtime-runes/samples/bind-this-proxy/_config.js +++ b/packages/svelte/tests/runtime-runes/samples/bind-this-proxy/_config.js @@ -1,15 +1,10 @@ import { flushSync } from 'svelte'; import { test } from '../../test'; -import { log } from './log.js'; export default test({ - before_test: () => { - log.length = 0; - }, - html: `
Hello\nworld
`, - async test({ assert, target }) { + async test({ assert, target, logs }) { const [btn1] = target.querySelectorAll('button'); flushSync(() => { @@ -24,6 +19,6 @@ export default test({ assert.htmlEqual(target.innerHTML, `
Hello\nworld
`); - assert.deepEqual(log, [{ a: {} }, null, { a: {} }]); + assert.deepEqual(logs, [{ a: {} }, null, { a: {} }]); } }); diff --git a/packages/svelte/tests/runtime-runes/samples/bind-this-proxy/log.js b/packages/svelte/tests/runtime-runes/samples/bind-this-proxy/log.js deleted file mode 100644 index d3df521f4d..0000000000 --- a/packages/svelte/tests/runtime-runes/samples/bind-this-proxy/log.js +++ /dev/null @@ -1,2 +0,0 @@ -/** @type {any[]} */ -export const log = []; diff --git a/packages/svelte/tests/runtime-runes/samples/bind-this-proxy/main.svelte b/packages/svelte/tests/runtime-runes/samples/bind-this-proxy/main.svelte index adc67f46ae..6c24d5588a 100644 --- a/packages/svelte/tests/runtime-runes/samples/bind-this-proxy/main.svelte +++ b/packages/svelte/tests/runtime-runes/samples/bind-this-proxy/main.svelte @@ -1,12 +1,11 @@ diff --git a/packages/svelte/tests/runtime-runes/samples/class-frozen-state-object/_config.js b/packages/svelte/tests/runtime-runes/samples/class-frozen-state-object/_config.js index 6ad9dff351..79a0d13bdd 100644 --- a/packages/svelte/tests/runtime-runes/samples/class-frozen-state-object/_config.js +++ b/packages/svelte/tests/runtime-runes/samples/class-frozen-state-object/_config.js @@ -1,14 +1,9 @@ import { test } from '../../test'; -import { log } from './log.js'; export default test({ html: ``, - before_test() { - log.length = 0; - }, - - async test({ assert, target }) { + async test({ assert, target, logs }) { const btn = target.querySelector('button'); await btn?.click(); @@ -17,6 +12,6 @@ export default test({ await btn?.click(); assert.htmlEqual(target.innerHTML, ``); - assert.deepEqual(log, ['read only', 'read only']); + assert.deepEqual(logs, ['read only', 'read only']); } }); diff --git a/packages/svelte/tests/runtime-runes/samples/class-frozen-state-object/log.js b/packages/svelte/tests/runtime-runes/samples/class-frozen-state-object/log.js deleted file mode 100644 index d3df521f4d..0000000000 --- a/packages/svelte/tests/runtime-runes/samples/class-frozen-state-object/log.js +++ /dev/null @@ -1,2 +0,0 @@ -/** @type {any[]} */ -export const log = []; diff --git a/packages/svelte/tests/runtime-runes/samples/class-frozen-state-object/main.svelte b/packages/svelte/tests/runtime-runes/samples/class-frozen-state-object/main.svelte index e381961fe9..bdadbeee82 100644 --- a/packages/svelte/tests/runtime-runes/samples/class-frozen-state-object/main.svelte +++ b/packages/svelte/tests/runtime-runes/samples/class-frozen-state-object/main.svelte @@ -1,6 +1,4 @@ diff --git a/packages/svelte/tests/runtime-runes/samples/class-state-init-eager-2/_config.js b/packages/svelte/tests/runtime-runes/samples/class-state-init-eager-2/_config.js index e11107a95c..6d49c0436f 100644 --- a/packages/svelte/tests/runtime-runes/samples/class-state-init-eager-2/_config.js +++ b/packages/svelte/tests/runtime-runes/samples/class-state-init-eager-2/_config.js @@ -1,14 +1,9 @@ import { test } from '../../test'; -import { log } from './log.js'; export default test({ html: ``, - before_test() { - log.length = 0; - }, - - async test({ assert, target }) { + async test({ assert, target, logs }) { const btn = target.querySelector('button'); await btn?.click(); @@ -17,6 +12,6 @@ export default test({ await btn?.click(); assert.htmlEqual(target.innerHTML, ``); - assert.deepEqual(log, [undefined]); + assert.deepEqual(logs, [undefined]); } }); diff --git a/packages/svelte/tests/runtime-runes/samples/class-state-init-eager-2/log.js b/packages/svelte/tests/runtime-runes/samples/class-state-init-eager-2/log.js deleted file mode 100644 index d3df521f4d..0000000000 --- a/packages/svelte/tests/runtime-runes/samples/class-state-init-eager-2/log.js +++ /dev/null @@ -1,2 +0,0 @@ -/** @type {any[]} */ -export const log = []; diff --git a/packages/svelte/tests/runtime-runes/samples/class-state-init-eager-2/main.svelte b/packages/svelte/tests/runtime-runes/samples/class-state-init-eager-2/main.svelte index 5a0d7b0de2..6409795767 100644 --- a/packages/svelte/tests/runtime-runes/samples/class-state-init-eager-2/main.svelte +++ b/packages/svelte/tests/runtime-runes/samples/class-state-init-eager-2/main.svelte @@ -1,8 +1,6 @@ diff --git a/packages/svelte/tests/runtime-runes/samples/derived-fn-destructure/_config.js b/packages/svelte/tests/runtime-runes/samples/derived-fn-destructure/_config.js index 1b6357656a..71c7e40ed5 100644 --- a/packages/svelte/tests/runtime-runes/samples/derived-fn-destructure/_config.js +++ b/packages/svelte/tests/runtime-runes/samples/derived-fn-destructure/_config.js @@ -1,19 +1,15 @@ import { test } from '../../test'; -import { log } from './log.js'; export default test({ - before_test() { - log.length = 0; - }, - + mode: ['server'], html: ``, - async test({ assert, target, window }) { + async test({ assert, target, window, logs }) { const btn = target.querySelector('button'); const clickEvent = new window.Event('click', { bubbles: true }); await btn?.dispatchEvent(clickEvent); assert.htmlEqual(target.innerHTML, ``); - assert.deepEqual(log, ['create_derived']); + assert.deepEqual(logs, ['create_derived']); } }); diff --git a/packages/svelte/tests/runtime-runes/samples/derived-fn-destructure/log.js b/packages/svelte/tests/runtime-runes/samples/derived-fn-destructure/log.js deleted file mode 100644 index d3df521f4d..0000000000 --- a/packages/svelte/tests/runtime-runes/samples/derived-fn-destructure/log.js +++ /dev/null @@ -1,2 +0,0 @@ -/** @type {any[]} */ -export const log = []; diff --git a/packages/svelte/tests/runtime-runes/samples/derived-fn-destructure/main.svelte b/packages/svelte/tests/runtime-runes/samples/derived-fn-destructure/main.svelte index 520765469b..bdedef7197 100644 --- a/packages/svelte/tests/runtime-runes/samples/derived-fn-destructure/main.svelte +++ b/packages/svelte/tests/runtime-runes/samples/derived-fn-destructure/main.svelte @@ -1,9 +1,7 @@ diff --git a/packages/svelte/tests/runtime-runes/samples/destructure-derived-event/_config.js b/packages/svelte/tests/runtime-runes/samples/destructure-derived-event/_config.js index 0645ff4a16..6ad462cddb 100644 --- a/packages/svelte/tests/runtime-runes/samples/destructure-derived-event/_config.js +++ b/packages/svelte/tests/runtime-runes/samples/destructure-derived-event/_config.js @@ -1,15 +1,10 @@ import { test } from '../../test'; -import { log } from './log.js'; export default test({ - before_test() { - log.length = 0; - }, - - async test({ assert, target, window }) { + async test({ assert, target, logs }) { const btn = target.querySelector('button'); await btn?.click(); - assert.deepEqual(log, ['works!']); + assert.deepEqual(logs, ['works!']); } }); diff --git a/packages/svelte/tests/runtime-runes/samples/destructure-derived-event/log.js b/packages/svelte/tests/runtime-runes/samples/destructure-derived-event/log.js deleted file mode 100644 index d3df521f4d..0000000000 --- a/packages/svelte/tests/runtime-runes/samples/destructure-derived-event/log.js +++ /dev/null @@ -1,2 +0,0 @@ -/** @type {any[]} */ -export const log = []; diff --git a/packages/svelte/tests/runtime-runes/samples/destructure-derived-event/main.svelte b/packages/svelte/tests/runtime-runes/samples/destructure-derived-event/main.svelte index d4f149eb81..4ad48eaec6 100644 --- a/packages/svelte/tests/runtime-runes/samples/destructure-derived-event/main.svelte +++ b/packages/svelte/tests/runtime-runes/samples/destructure-derived-event/main.svelte @@ -1,9 +1,7 @@ diff --git a/packages/svelte/tests/runtime-runes/samples/dynamic-transition/_config.js b/packages/svelte/tests/runtime-runes/samples/dynamic-transition/_config.js index 43c0bd7f86..91524c275e 100644 --- a/packages/svelte/tests/runtime-runes/samples/dynamic-transition/_config.js +++ b/packages/svelte/tests/runtime-runes/samples/dynamic-transition/_config.js @@ -1,31 +1,26 @@ import { flushSync } from 'svelte'; import { test } from '../../test'; -import { log } from './log.js'; export default test({ - before_test() { - log.length = 0; - }, - - async test({ assert, target }) { + async test({ assert, target, logs }) { const [b1, b2] = target.querySelectorAll('button'); flushSync(() => { b1.click(); }); - assert.deepEqual(log, ['transition 2']); + assert.deepEqual(logs, ['transition 2']); flushSync(() => { b2.click(); }); - assert.deepEqual(log, ['transition 2']); + assert.deepEqual(logs, ['transition 2']); flushSync(() => { b1.click(); }); - assert.deepEqual(log, ['transition 2', 'transition 1']); + assert.deepEqual(logs, ['transition 2', 'transition 1']); } }); diff --git a/packages/svelte/tests/runtime-runes/samples/dynamic-transition/log.js b/packages/svelte/tests/runtime-runes/samples/dynamic-transition/log.js deleted file mode 100644 index d3df521f4d..0000000000 --- a/packages/svelte/tests/runtime-runes/samples/dynamic-transition/log.js +++ /dev/null @@ -1,2 +0,0 @@ -/** @type {any[]} */ -export const log = []; diff --git a/packages/svelte/tests/runtime-runes/samples/dynamic-transition/main.svelte b/packages/svelte/tests/runtime-runes/samples/dynamic-transition/main.svelte index 8355a20d71..c075c42c5d 100644 --- a/packages/svelte/tests/runtime-runes/samples/dynamic-transition/main.svelte +++ b/packages/svelte/tests/runtime-runes/samples/dynamic-transition/main.svelte @@ -1,8 +1,6 @@ diff --git a/packages/svelte/tests/runtime-runes/samples/effect-order-2/_config.js b/packages/svelte/tests/runtime-runes/samples/effect-order-2/_config.js index 302026493f..110bd622a8 100644 --- a/packages/svelte/tests/runtime-runes/samples/effect-order-2/_config.js +++ b/packages/svelte/tests/runtime-runes/samples/effect-order-2/_config.js @@ -1,13 +1,8 @@ import { test } from '../../test'; import { flushSync } from 'svelte'; -import { log } from './log.js'; export default test({ - before_test() { - log.length = 0; - }, - - async test({ assert, target }) { + async test({ assert, target, logs }) { const [b1] = target.querySelectorAll('button'); flushSync(() => { b1.click(); @@ -15,7 +10,7 @@ export default test({ flushSync(() => { b1.click(); }); - assert.deepEqual(log, [ + assert.deepEqual(logs, [ { a: 1 }, { b: 1 }, { c: 1 }, diff --git a/packages/svelte/tests/runtime-runes/samples/effect-order-2/log.js b/packages/svelte/tests/runtime-runes/samples/effect-order-2/log.js deleted file mode 100644 index d3df521f4d..0000000000 --- a/packages/svelte/tests/runtime-runes/samples/effect-order-2/log.js +++ /dev/null @@ -1,2 +0,0 @@ -/** @type {any[]} */ -export const log = []; diff --git a/packages/svelte/tests/runtime-runes/samples/effect-order-2/main.svelte b/packages/svelte/tests/runtime-runes/samples/effect-order-2/main.svelte index fb9e9a6c53..7995527d44 100644 --- a/packages/svelte/tests/runtime-runes/samples/effect-order-2/main.svelte +++ b/packages/svelte/tests/runtime-runes/samples/effect-order-2/main.svelte @@ -1,19 +1,18 @@ diff --git a/packages/svelte/tests/runtime-runes/samples/effect-root-2/_config.js b/packages/svelte/tests/runtime-runes/samples/effect-root-2/_config.js index f6d99a0f5d..4c7aeb1ad1 100644 --- a/packages/svelte/tests/runtime-runes/samples/effect-root-2/_config.js +++ b/packages/svelte/tests/runtime-runes/samples/effect-root-2/_config.js @@ -1,31 +1,26 @@ import { flushSync } from 'svelte'; import { test } from '../../test'; -import { log } from './log.js'; export default test({ - before_test() { - log.length = 0; - }, - - async test({ assert, target }) { + async test({ assert, target, logs }) { const [b1, b2] = target.querySelectorAll('button'); flushSync(() => { b1.click(); }); - assert.deepEqual(log, [0]); + assert.deepEqual(logs, [0]); flushSync(() => { b2.click(); }); - assert.deepEqual(log, [0, 'cleanup']); + assert.deepEqual(logs, [0, 'cleanup']); flushSync(() => { b1.click(); }); - assert.deepEqual(log, [0, 'cleanup']); + assert.deepEqual(logs, [0, 'cleanup']); } }); diff --git a/packages/svelte/tests/runtime-runes/samples/effect-root-2/log.js b/packages/svelte/tests/runtime-runes/samples/effect-root-2/log.js deleted file mode 100644 index d3df521f4d..0000000000 --- a/packages/svelte/tests/runtime-runes/samples/effect-root-2/log.js +++ /dev/null @@ -1,2 +0,0 @@ -/** @type {any[]} */ -export const log = []; diff --git a/packages/svelte/tests/runtime-runes/samples/effect-root-2/main.svelte b/packages/svelte/tests/runtime-runes/samples/effect-root-2/main.svelte index 591975ce54..756053b03a 100644 --- a/packages/svelte/tests/runtime-runes/samples/effect-root-2/main.svelte +++ b/packages/svelte/tests/runtime-runes/samples/effect-root-2/main.svelte @@ -1,11 +1,9 @@ diff --git a/packages/svelte/tests/runtime-runes/samples/effect-root/_config.js b/packages/svelte/tests/runtime-runes/samples/effect-root/_config.js index 1a2afc898f..fe2a8bb499 100644 --- a/packages/svelte/tests/runtime-runes/samples/effect-root/_config.js +++ b/packages/svelte/tests/runtime-runes/samples/effect-root/_config.js @@ -1,13 +1,8 @@ import { flushSync } from 'svelte'; import { test } from '../../test'; -import { log } from './log.js'; export default test({ - before_test() { - log.length = 0; - }, - - async test({ assert, target }) { + async test({ assert, target, logs }) { const [b1, b2, b3] = target.querySelectorAll('button'); flushSync(() => { @@ -15,19 +10,19 @@ export default test({ b2.click(); }); - assert.deepEqual(log, [0, 1]); + assert.deepEqual(logs, [0, 1]); flushSync(() => { b3.click(); }); - assert.deepEqual(log, [0, 1, 'cleanup 1', 'cleanup 2']); + assert.deepEqual(logs, [0, 1, 'cleanup 1', 'cleanup 2']); flushSync(() => { b1.click(); b2.click(); }); - assert.deepEqual(log, [0, 1, 'cleanup 1', 'cleanup 2']); + assert.deepEqual(logs, [0, 1, 'cleanup 1', 'cleanup 2']); } }); diff --git a/packages/svelte/tests/runtime-runes/samples/effect-root/log.js b/packages/svelte/tests/runtime-runes/samples/effect-root/log.js deleted file mode 100644 index d3df521f4d..0000000000 --- a/packages/svelte/tests/runtime-runes/samples/effect-root/log.js +++ /dev/null @@ -1,2 +0,0 @@ -/** @type {any[]} */ -export const log = []; diff --git a/packages/svelte/tests/runtime-runes/samples/effect-root/main.svelte b/packages/svelte/tests/runtime-runes/samples/effect-root/main.svelte index f7e8275aae..65abb24374 100644 --- a/packages/svelte/tests/runtime-runes/samples/effect-root/main.svelte +++ b/packages/svelte/tests/runtime-runes/samples/effect-root/main.svelte @@ -1,22 +1,20 @@ diff --git a/packages/svelte/tests/runtime-runes/samples/effects-order/_config.js b/packages/svelte/tests/runtime-runes/samples/effects-order/_config.js index 25b05af207..e4ca2d72a6 100644 --- a/packages/svelte/tests/runtime-runes/samples/effects-order/_config.js +++ b/packages/svelte/tests/runtime-runes/samples/effects-order/_config.js @@ -1,17 +1,12 @@ import { test } from '../../test'; -import { log } from './log.js'; export default test({ - before_test() { - log.length = 0; - }, - - async test({ assert, target }) { + async test({ assert, target, logs }) { const [b1, b2] = target.querySelectorAll('button'); b1.click(); b2.click(); await Promise.resolve(); - assert.deepEqual(log, ['first0', 'second0', 'first1', 'second1']); + assert.deepEqual(logs, ['first0', 'second0', 'first1', 'second1']); } }); diff --git a/packages/svelte/tests/runtime-runes/samples/effects-order/log.js b/packages/svelte/tests/runtime-runes/samples/effects-order/log.js deleted file mode 100644 index d3df521f4d..0000000000 --- a/packages/svelte/tests/runtime-runes/samples/effects-order/log.js +++ /dev/null @@ -1,2 +0,0 @@ -/** @type {any[]} */ -export const log = []; diff --git a/packages/svelte/tests/runtime-runes/samples/effects-order/main.svelte b/packages/svelte/tests/runtime-runes/samples/effects-order/main.svelte index 5d8973be35..1fb1c44e8e 100644 --- a/packages/svelte/tests/runtime-runes/samples/effects-order/main.svelte +++ b/packages/svelte/tests/runtime-runes/samples/effects-order/main.svelte @@ -1,15 +1,13 @@ diff --git a/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation-2/_config.js b/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation-2/_config.js index 262240f5f3..b8cfb1e584 100644 --- a/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation-2/_config.js +++ b/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation-2/_config.js @@ -1,13 +1,8 @@ import { flushSync } from 'svelte'; import { test } from '../../test'; -import { log } from './log.js'; export default test({ - before_test() { - log.length = 0; - }, - - async test({ assert, target }) { + async test({ assert, target, logs }) { const [b1] = target.querySelectorAll('button'); flushSync(() => { @@ -15,6 +10,6 @@ export default test({ }); await Promise.resolve(); - assert.deepEqual(log, ['clicked button']); + assert.deepEqual(logs, ['clicked button']); } }); diff --git a/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation-2/log.js b/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation-2/log.js deleted file mode 100644 index d3df521f4d..0000000000 --- a/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation-2/log.js +++ /dev/null @@ -1,2 +0,0 @@ -/** @type {any[]} */ -export const log = []; diff --git a/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation-2/main.svelte b/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation-2/main.svelte index dc5fdd214e..2a18005538 100644 --- a/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation-2/main.svelte +++ b/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation-2/main.svelte @@ -1,8 +1,5 @@ - -
{ log.push('clicked div') }}> -
diff --git a/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation-3/_config.js b/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation-3/_config.js index 262240f5f3..b8cfb1e584 100644 --- a/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation-3/_config.js +++ b/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation-3/_config.js @@ -1,13 +1,8 @@ import { flushSync } from 'svelte'; import { test } from '../../test'; -import { log } from './log.js'; export default test({ - before_test() { - log.length = 0; - }, - - async test({ assert, target }) { + async test({ assert, target, logs }) { const [b1] = target.querySelectorAll('button'); flushSync(() => { @@ -15,6 +10,6 @@ export default test({ }); await Promise.resolve(); - assert.deepEqual(log, ['clicked button']); + assert.deepEqual(logs, ['clicked button']); } }); diff --git a/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation-3/log.js b/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation-3/log.js deleted file mode 100644 index d3df521f4d..0000000000 --- a/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation-3/log.js +++ /dev/null @@ -1,2 +0,0 @@ -/** @type {any[]} */ -export const log = []; diff --git a/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation-3/main.svelte b/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation-3/main.svelte index 4cead08260..d39bdf42c3 100644 --- a/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation-3/main.svelte +++ b/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation-3/main.svelte @@ -1,11 +1,10 @@ -
log.push('clicked container')} onkeydown={() => {}}> -
{ log.push('clicked div 1') }}> -
{ log.push('clicked div 2') }}> -
diff --git a/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation-4/_config.js b/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation-4/_config.js index 9830e74646..d253b9b6fc 100644 --- a/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation-4/_config.js +++ b/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation-4/_config.js @@ -1,17 +1,12 @@ import { test } from '../../test'; -import { log } from './log.js'; export default test({ - before_test() { - log.length = 0; - }, - - async test({ assert, target }) { + async test({ assert, target, logs }) { const [btn1, btn2] = target.querySelectorAll('button'); btn1?.click(); await Promise.resolve(); - assert.deepEqual(log, [ + assert.deepEqual(logs, [ 'button main', 'div main 1', 'div main 2', @@ -21,10 +16,10 @@ export default test({ 'window sub' ]); - log.length = 0; + logs.length = 0; btn2?.click(); await Promise.resolve(); - assert.deepEqual(log, [ + assert.deepEqual(logs, [ 'button sub', 'document main', 'document sub', diff --git a/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation-4/log.js b/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation-4/log.js deleted file mode 100644 index d3df521f4d..0000000000 --- a/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation-4/log.js +++ /dev/null @@ -1,2 +0,0 @@ -/** @type {any[]} */ -export const log = []; diff --git a/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation-4/main.svelte b/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation-4/main.svelte index 9fa1484907..9697540e18 100644 --- a/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation-4/main.svelte +++ b/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation-4/main.svelte @@ -1,13 +1,12 @@ - - + + -
log.push('div main 1')} on:click={() => log.push('div main 2')}> - +
console.log('div main 1')} on:click={() => console.log('div main 2')}> +
diff --git a/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation-4/sub.svelte b/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation-4/sub.svelte index c6c900b8b4..a7dd74a4c5 100644 --- a/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation-4/sub.svelte +++ b/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation-4/sub.svelte @@ -1,8 +1,4 @@ - + console.log('window sub')} /> + console.log('document sub')} /> - log.push('window sub')} /> - log.push('document sub')} /> - - + diff --git a/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation-5/_config.js b/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation-5/_config.js index fcbb0dbe2a..6fa7b732bf 100644 --- a/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation-5/_config.js +++ b/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation-5/_config.js @@ -1,17 +1,12 @@ import { test } from '../../test'; -import { log } from './log.js'; export default test({ - before_test() { - log.length = 0; - }, - - async test({ assert, target }) { + async test({ assert, target, logs }) { const btn = target.querySelector('button'); btn?.click(); await Promise.resolve(); - assert.deepEqual(log, [ + assert.deepEqual(logs, [ 'button onclick', 'button on:click', 'inner div on:click', diff --git a/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation-5/log.js b/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation-5/log.js deleted file mode 100644 index d3df521f4d..0000000000 --- a/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation-5/log.js +++ /dev/null @@ -1,2 +0,0 @@ -/** @type {any[]} */ -export const log = []; diff --git a/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation-5/main.svelte b/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation-5/main.svelte index 438ecf5dc3..6df18bff43 100644 --- a/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation-5/main.svelte +++ b/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation-5/main.svelte @@ -1,9 +1,5 @@ - - -
log.push('outer div onclick')}> -
log.push('inner div on:click')}> - +
console.log('outer div onclick')}> +
console.log('inner div on:click')}> +
diff --git a/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation-6/_config.js b/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation-6/_config.js index bc16bf031f..af62498171 100644 --- a/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation-6/_config.js +++ b/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation-6/_config.js @@ -1,16 +1,11 @@ import { test } from '../../test'; -import { log } from './log.js'; export default test({ - before_test() { - log.length = 0; - }, - - async test({ assert, target }) { + async test({ assert, target, logs }) { const btn = target.querySelector('button'); btn?.click(); await Promise.resolve(); - assert.deepEqual(log, ['method']); + assert.deepEqual(logs, ['method']); } }); diff --git a/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation-6/log.js b/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation-6/log.js deleted file mode 100644 index d3df521f4d..0000000000 --- a/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation-6/log.js +++ /dev/null @@ -1,2 +0,0 @@ -/** @type {any[]} */ -export const log = []; diff --git a/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation-6/main.svelte b/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation-6/main.svelte index 0a365990ec..d1696a04c1 100644 --- a/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation-6/main.svelte +++ b/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation-6/main.svelte @@ -1,9 +1,7 @@ diff --git a/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation-7/_config.js b/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation-7/_config.js index 69f1788171..3d3377b125 100644 --- a/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation-7/_config.js +++ b/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation-7/_config.js @@ -1,16 +1,11 @@ import { test } from '../../test'; -import { log } from './log.js'; export default test({ - before_test() { - log.length = 0; - }, - - async test({ assert, target }) { + async test({ assert, target, logs }) { const btn = target.querySelector('button'); btn?.click(); await Promise.resolve(); - assert.deepEqual(log, ['div onclickcapture', 'button onclick']); + assert.deepEqual(logs, ['div onclickcapture', 'button onclick']); } }); diff --git a/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation-7/log.js b/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation-7/log.js deleted file mode 100644 index d3df521f4d..0000000000 --- a/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation-7/log.js +++ /dev/null @@ -1,2 +0,0 @@ -/** @type {any[]} */ -export const log = []; diff --git a/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation-7/main.svelte b/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation-7/main.svelte index b79cc9008f..55f1608e77 100644 --- a/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation-7/main.svelte +++ b/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation-7/main.svelte @@ -1,7 +1,3 @@ - - -
log.push('div onclickcapture')}> - +
console.log('div onclickcapture')}> +
diff --git a/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation/_config.js b/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation/_config.js index b1f5931a1e..bbe67d1bed 100644 --- a/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation/_config.js +++ b/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation/_config.js @@ -1,13 +1,8 @@ import { flushSync } from 'svelte'; import { test } from '../../test'; -import { log } from './log.js'; export default test({ - before_test() { - log.length = 0; - }, - - async test({ assert, target }) { + async test({ assert, target, logs }) { const [b1] = target.querySelectorAll('button'); flushSync(() => { @@ -15,7 +10,7 @@ export default test({ }); await Promise.resolve(); - assert.deepEqual(log, [ + assert.deepEqual(logs, [ 'clicked button', 'clicked div 2', 'clicked div 1', diff --git a/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation/log.js b/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation/log.js deleted file mode 100644 index d3df521f4d..0000000000 --- a/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation/log.js +++ /dev/null @@ -1,2 +0,0 @@ -/** @type {any[]} */ -export const log = []; diff --git a/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation/main.svelte b/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation/main.svelte index 8d3ac9fcc0..d1f767288a 100644 --- a/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation/main.svelte +++ b/packages/svelte/tests/runtime-runes/samples/event-attribute-delegation/main.svelte @@ -1,11 +1,10 @@ -
log.push('clicked container')} onkeydown={() => {}}> -
{ log.push('clicked div 1') }}> -
{ log.push('clicked div 2') }}> -
diff --git a/packages/svelte/tests/runtime-runes/samples/event-prop-reference/_config.js b/packages/svelte/tests/runtime-runes/samples/event-prop-reference/_config.js index 3b801f6b7b..4d387569ee 100644 --- a/packages/svelte/tests/runtime-runes/samples/event-prop-reference/_config.js +++ b/packages/svelte/tests/runtime-runes/samples/event-prop-reference/_config.js @@ -1,21 +1,16 @@ import { test } from '../../test'; -import { log } from './log.js'; export default test({ - before_test() { - log.length = 0; - }, - get props() { return { item: { name: 'Dominic' } }; }, - async test({ assert, target }) { + async test({ assert, target, logs }) { const [b1] = target.querySelectorAll('button'); b1?.click(); await Promise.resolve(); - assert.deepEqual(log, ['Dominic']); + assert.deepEqual(logs, ['Dominic']); } }); diff --git a/packages/svelte/tests/runtime-runes/samples/event-prop-reference/log.js b/packages/svelte/tests/runtime-runes/samples/event-prop-reference/log.js deleted file mode 100644 index d3df521f4d..0000000000 --- a/packages/svelte/tests/runtime-runes/samples/event-prop-reference/log.js +++ /dev/null @@ -1,2 +0,0 @@ -/** @type {any[]} */ -export const log = []; diff --git a/packages/svelte/tests/runtime-runes/samples/event-prop-reference/main.svelte b/packages/svelte/tests/runtime-runes/samples/event-prop-reference/main.svelte index 697338d97b..258ef6046c 100644 --- a/packages/svelte/tests/runtime-runes/samples/event-prop-reference/main.svelte +++ b/packages/svelte/tests/runtime-runes/samples/event-prop-reference/main.svelte @@ -1,10 +1,8 @@ diff --git a/packages/svelte/tests/runtime-runes/samples/inspect-derived-2/_config.js b/packages/svelte/tests/runtime-runes/samples/inspect-derived-2/_config.js index 0e6cf85884..9474397f7f 100644 --- a/packages/svelte/tests/runtime-runes/samples/inspect-derived-2/_config.js +++ b/packages/svelte/tests/runtime-runes/samples/inspect-derived-2/_config.js @@ -1,30 +1,12 @@ import { flushSync } from 'svelte'; import { test } from '../../test'; -/** - * @type {any[]} - */ -let log; -/** - * @type {typeof console.log}} - */ -let original_log; - export default test({ compileOptions: { dev: true }, - before_test() { - log = []; - original_log = console.log; - console.log = (...v) => { - log.push(...v); - }; - }, - after_test() { - console.log = original_log; - }, - async test({ assert, target }) { + + async test({ assert, target, logs }) { const button = target.querySelector('button'); flushSync(() => { @@ -32,7 +14,7 @@ export default test({ }); assert.htmlEqual(target.innerHTML, `\n1`); - assert.deepEqual(log, [ + assert.deepEqual(logs, [ 'init', { data: { diff --git a/packages/svelte/tests/runtime-runes/samples/inspect-multiple/_config.js b/packages/svelte/tests/runtime-runes/samples/inspect-multiple/_config.js index be3c1988bd..fc9a0cda9a 100644 --- a/packages/svelte/tests/runtime-runes/samples/inspect-multiple/_config.js +++ b/packages/svelte/tests/runtime-runes/samples/inspect-multiple/_config.js @@ -1,34 +1,16 @@ import { test } from '../../test'; -/** - * @type {any[]} - */ -let log; -/** - * @type {typeof console.log}} - */ -let original_log; - export default test({ compileOptions: { dev: true }, - before_test() { - log = []; - original_log = console.log; - console.log = (...v) => { - log.push(...v); - }; - }, - after_test() { - console.log = original_log; - }, - async test({ assert, target }) { + + async test({ assert, target, logs }) { const [b1, b2] = target.querySelectorAll('button'); b1.click(); b2.click(); await Promise.resolve(); - assert.deepEqual(log, ['init', 0, 0, 'update', 1, 0, 'update', 1, 1]); + assert.deepEqual(logs, ['init', 0, 0, 'update', 1, 0, 'update', 1, 1]); } }); diff --git a/packages/svelte/tests/runtime-runes/samples/inspect-nested-state/_config.js b/packages/svelte/tests/runtime-runes/samples/inspect-nested-state/_config.js index 32c9e98296..e4d9fb5013 100644 --- a/packages/svelte/tests/runtime-runes/samples/inspect-nested-state/_config.js +++ b/packages/svelte/tests/runtime-runes/samples/inspect-nested-state/_config.js @@ -1,34 +1,16 @@ import { test } from '../../test'; -/** - * @type {any[]} - */ -let log; -/** - * @type {typeof console.log}} - */ -let original_log; - export default test({ compileOptions: { dev: true }, - before_test() { - log = []; - original_log = console.log; - console.log = (...v) => { - log.push(...v); - }; - }, - after_test() { - console.log = original_log; - }, - async test({ assert, target }) { + + async test({ assert, target, logs }) { const [b1] = target.querySelectorAll('button'); b1.click(); await Promise.resolve(); - assert.deepEqual(log, [ + assert.deepEqual(logs, [ 'init', { x: { count: 0 } }, [{ count: 0 }], diff --git a/packages/svelte/tests/runtime-runes/samples/inspect-new-property/_config.js b/packages/svelte/tests/runtime-runes/samples/inspect-new-property/_config.js index 5e5150bf0d..a85972a0f9 100644 --- a/packages/svelte/tests/runtime-runes/samples/inspect-new-property/_config.js +++ b/packages/svelte/tests/runtime-runes/samples/inspect-new-property/_config.js @@ -1,33 +1,15 @@ import { test } from '../../test'; -/** - * @type {any[]} - */ -let log; -/** - * @type {typeof console.log}} - */ -let original_log; - export default test({ compileOptions: { dev: true }, - before_test() { - log = []; - original_log = console.log; - console.log = (...v) => { - log.push(...v); - }; - }, - after_test() { - console.log = original_log; - }, - async test({ assert, target }) { + + async test({ assert, target, logs }) { const [btn] = target.querySelectorAll('button'); btn.click(); await Promise.resolve(); - assert.deepEqual(log, ['init', {}, 'init', [], 'update', { x: 'hello' }, 'update', ['hello']]); + assert.deepEqual(logs, ['init', {}, 'init', [], 'update', { x: 'hello' }, 'update', ['hello']]); } }); diff --git a/packages/svelte/tests/runtime-runes/samples/inspect-trace/_config.js b/packages/svelte/tests/runtime-runes/samples/inspect-trace/_config.js index 43b0915426..7bb71adafb 100644 --- a/packages/svelte/tests/runtime-runes/samples/inspect-trace/_config.js +++ b/packages/svelte/tests/runtime-runes/samples/inspect-trace/_config.js @@ -1,37 +1,19 @@ import { test } from '../../test'; -/** - * @type {any[]} - */ -let log; -/** - * @type {typeof console.log}} - */ -let original_log; - export default test({ compileOptions: { dev: true }, - before_test() { - log = []; - original_log = console.log; - console.log = (...v) => { - log.push(...v); - }; - }, - after_test() { - console.log = original_log; - }, - async test({ assert, target }) { - assert.deepEqual(log, []); + + async test({ assert, target, logs }) { + assert.deepEqual(logs, []); const [b1, b2] = target.querySelectorAll('button'); b1.click(); b2.click(); await Promise.resolve(); - assert.ok(log[0].stack.startsWith('Error:') && log[0].stack.includes('HTMLButtonElement.')); - assert.deepEqual(log[1], 1); + assert.ok(logs[0].stack.startsWith('Error:') && logs[0].stack.includes('HTMLButtonElement.')); + assert.deepEqual(logs[1], 1); } }); diff --git a/packages/svelte/tests/runtime-runes/samples/inspect/_config.js b/packages/svelte/tests/runtime-runes/samples/inspect/_config.js index 1f63249e31..09a921abee 100644 --- a/packages/svelte/tests/runtime-runes/samples/inspect/_config.js +++ b/packages/svelte/tests/runtime-runes/samples/inspect/_config.js @@ -1,34 +1,16 @@ import { test } from '../../test'; -/** - * @type {any[]} - */ -let log; -/** - * @type {typeof console.log}} - */ -let original_log; - export default test({ compileOptions: { dev: true }, - before_test() { - log = []; - original_log = console.log; - console.log = (...v) => { - log.push(...v); - }; - }, - after_test() { - console.log = original_log; - }, - async test({ assert, target }) { + + async test({ assert, target, logs }) { const [b1, b2] = target.querySelectorAll('button'); b1.click(); b2.click(); await Promise.resolve(); - assert.deepEqual(log, ['init', 0, 'update', 1]); + assert.deepEqual(logs, ['init', 0, 'update', 1]); } }); diff --git a/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-2/Item.svelte b/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-2/Item.svelte index 5375195617..f427b849e3 100644 --- a/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-2/Item.svelte +++ b/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-2/Item.svelte @@ -1,23 +1,21 @@ diff --git a/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-2/_config.js b/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-2/_config.js index 2667fff13c..b0271da3f1 100644 --- a/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-2/_config.js +++ b/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-2/_config.js @@ -1,17 +1,12 @@ import { test } from '../../test'; -import { log } from './log.js'; export default test({ get props() { return { n: 0 }; }, - before_test() { - log.length = 0; - }, - - async test({ assert, component }) { - assert.deepEqual(log, [ + async test({ assert, component, logs }) { + assert.deepEqual(logs, [ 'parent: $effect.pre 0', 'parent: $effect.pre (2) 0', 'parent: render 0', @@ -30,11 +25,11 @@ export default test({ 'parent: $effect 0' ]); - log.length = 0; + logs.length = 0; component.n += 1; - assert.deepEqual(log, [ + assert.deepEqual(logs, [ 'parent: $effect.pre 1', 'parent: $effect.pre (2) 1', 'parent: render 1', diff --git a/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-2/log.js b/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-2/log.js deleted file mode 100644 index d3df521f4d..0000000000 --- a/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-2/log.js +++ /dev/null @@ -1,2 +0,0 @@ -/** @type {any[]} */ -export const log = []; diff --git a/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-2/main.svelte b/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-2/main.svelte index cc21df4f1b..e5dd43494c 100644 --- a/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-2/main.svelte +++ b/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-2/main.svelte @@ -1,24 +1,23 @@ diff --git a/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-3/Item.svelte b/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-3/Item.svelte index 8719c578f9..de1573539e 100644 --- a/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-3/Item.svelte +++ b/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-3/Item.svelte @@ -1,19 +1,17 @@ diff --git a/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-3/_config.js b/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-3/_config.js index e528189597..04cfa4b0d5 100644 --- a/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-3/_config.js +++ b/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-3/_config.js @@ -1,17 +1,12 @@ import { test } from '../../test'; -import { log } from './log.js'; export default test({ get props() { return { n: 0 }; }, - before_test() { - log.length = 0; - }, - - async test({ assert, component }) { - assert.deepEqual(log, [ + async test({ assert, component, logs }) { + assert.deepEqual(logs, [ 'parent: render 0', '1: $effect.pre 0', '1: render 0', @@ -25,11 +20,11 @@ export default test({ 'parent: $effect 0' ]); - log.length = 0; + logs.length = 0; component.n += 1; - assert.deepEqual(log, [ + assert.deepEqual(logs, [ 'parent: render 1', '1: $effect.pre 1', '1: render 1', diff --git a/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-3/log.js b/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-3/log.js deleted file mode 100644 index d3df521f4d..0000000000 --- a/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-3/log.js +++ /dev/null @@ -1,2 +0,0 @@ -/** @type {any[]} */ -export const log = []; diff --git a/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-3/main.svelte b/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-3/main.svelte index 57d85095d5..a029b9f18a 100644 --- a/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-3/main.svelte +++ b/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-3/main.svelte @@ -1,16 +1,15 @@ diff --git a/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-4/Item.svelte b/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-4/Item.svelte index 2e9dc09c7a..cffeaf41b5 100644 --- a/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-4/Item.svelte +++ b/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-4/Item.svelte @@ -1,23 +1,21 @@ diff --git a/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-4/_config.js b/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-4/_config.js index 62a4b85546..d0e27957c5 100644 --- a/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-4/_config.js +++ b/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-4/_config.js @@ -1,17 +1,12 @@ import { test } from '../../test'; -import { log } from './log.js'; export default test({ get props() { return { n: 0 }; }, - before_test() { - log.length = 0; - }, - - async test({ assert, component }) { - assert.deepEqual(log, [ + async test({ assert, component, logs }) { + assert.deepEqual(logs, [ 'parent: $effect.pre 0', 'parent: nested $effect.pre 0', 'parent: render 0', @@ -30,11 +25,11 @@ export default test({ 'parent: $effect 0' ]); - log.length = 0; + logs.length = 0; component.n += 1; - assert.deepEqual(log, [ + assert.deepEqual(logs, [ 'parent: $effect.pre 1', 'parent: nested $effect.pre 1', 'parent: render 1', diff --git a/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-4/log.js b/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-4/log.js deleted file mode 100644 index d3df521f4d..0000000000 --- a/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-4/log.js +++ /dev/null @@ -1,2 +0,0 @@ -/** @type {any[]} */ -export const log = []; diff --git a/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-4/main.svelte b/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-4/main.svelte index d9b83f837c..91cce1937b 100644 --- a/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-4/main.svelte +++ b/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-4/main.svelte @@ -1,24 +1,23 @@ diff --git a/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-5/_config.js b/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-5/_config.js index bc62b4f2c9..54212a580a 100644 --- a/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-5/_config.js +++ b/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-5/_config.js @@ -1,21 +1,16 @@ import { test } from '../../test'; -import { log } from './log.js'; export default test({ get props() { return { n: 0 }; }, - before_test() { - log.length = 0; - }, - - async test({ assert, component }) { - assert.deepEqual(log, ['$effect.pre 0', 'another $effect.pre 1', 'render n0', 'render i1']); + async test({ assert, component, logs }) { + assert.deepEqual(logs, ['$effect.pre 0', 'another $effect.pre 1', 'render n0', 'render i1']); - log.length = 0; + logs.length = 0; component.n += 1; - assert.deepEqual(log, ['$effect.pre 1', 'another $effect.pre 2', 'render n1', 'render i2']); + assert.deepEqual(logs, ['$effect.pre 1', 'another $effect.pre 2', 'render n1', 'render i2']); } }); diff --git a/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-5/log.js b/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-5/log.js deleted file mode 100644 index d3df521f4d..0000000000 --- a/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-5/log.js +++ /dev/null @@ -1,2 +0,0 @@ -/** @type {any[]} */ -export const log = []; diff --git a/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-5/main.svelte b/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-5/main.svelte index ecbd9321bf..a648f04865 100644 --- a/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-5/main.svelte +++ b/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children-5/main.svelte @@ -1,17 +1,20 @@ diff --git a/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children/Item.svelte b/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children/Item.svelte index 8719c578f9..de1573539e 100644 --- a/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children/Item.svelte +++ b/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children/Item.svelte @@ -1,19 +1,17 @@ diff --git a/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children/_config.js b/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children/_config.js index 0c7118df75..affe03c344 100644 --- a/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children/_config.js +++ b/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children/_config.js @@ -1,17 +1,12 @@ import { test } from '../../test'; -import { log } from './log.js'; export default test({ get props() { return { n: 0 }; }, - before_test() { - log.length = 0; - }, - - async test({ assert, component }) { - assert.deepEqual(log, [ + async test({ assert, component, logs }) { + assert.deepEqual(logs, [ 'parent: $effect.pre 0', 'parent: render 0', '1: $effect.pre 0', @@ -26,11 +21,11 @@ export default test({ 'parent: $effect 0' ]); - log.length = 0; + logs.length = 0; component.n += 1; - assert.deepEqual(log, [ + assert.deepEqual(logs, [ 'parent: $effect.pre 1', 'parent: render 1', '1: $effect.pre 1', diff --git a/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children/log.js b/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children/log.js deleted file mode 100644 index d3df521f4d..0000000000 --- a/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children/log.js +++ /dev/null @@ -1,2 +0,0 @@ -/** @type {any[]} */ -export const log = []; diff --git a/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children/main.svelte b/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children/main.svelte index 9cfa2b834c..f3918be07c 100644 --- a/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children/main.svelte +++ b/packages/svelte/tests/runtime-runes/samples/lifecycle-render-order-for-children/main.svelte @@ -1,20 +1,19 @@ diff --git a/packages/svelte/tests/runtime-runes/samples/nested-effect-conflict/_config.js b/packages/svelte/tests/runtime-runes/samples/nested-effect-conflict/_config.js index 6de94097f2..a8c16b7008 100644 --- a/packages/svelte/tests/runtime-runes/samples/nested-effect-conflict/_config.js +++ b/packages/svelte/tests/runtime-runes/samples/nested-effect-conflict/_config.js @@ -1,13 +1,8 @@ import { flushSync } from 'svelte'; import { test } from '../../test'; -import { log } from './log.js'; export default test({ - before_test() { - log.length = 0; - }, - - async test({ assert, target }) { + async test({ assert, target, logs }) { const [b1] = target.querySelectorAll('button'); flushSync(() => { @@ -15,7 +10,7 @@ export default test({ }); await Promise.resolve(); - assert.deepEqual(log, [ + assert.deepEqual(logs, [ 'top level', 'inner', 0, diff --git a/packages/svelte/tests/runtime-runes/samples/nested-effect-conflict/log.js b/packages/svelte/tests/runtime-runes/samples/nested-effect-conflict/log.js deleted file mode 100644 index d3df521f4d..0000000000 --- a/packages/svelte/tests/runtime-runes/samples/nested-effect-conflict/log.js +++ /dev/null @@ -1,2 +0,0 @@ -/** @type {any[]} */ -export const log = []; diff --git a/packages/svelte/tests/runtime-runes/samples/nested-effect-conflict/main.svelte b/packages/svelte/tests/runtime-runes/samples/nested-effect-conflict/main.svelte index a7c6625dc1..47c98e5499 100644 --- a/packages/svelte/tests/runtime-runes/samples/nested-effect-conflict/main.svelte +++ b/packages/svelte/tests/runtime-runes/samples/nested-effect-conflict/main.svelte @@ -1,18 +1,17 @@ diff --git a/packages/svelte/tests/runtime-runes/samples/nested-script-tag/_config.js b/packages/svelte/tests/runtime-runes/samples/nested-script-tag/_config.js index 051f54889d..843805993f 100644 --- a/packages/svelte/tests/runtime-runes/samples/nested-script-tag/_config.js +++ b/packages/svelte/tests/runtime-runes/samples/nested-script-tag/_config.js @@ -1,28 +1,9 @@ import { test } from '../../test'; -/** - * @type {any[]} - */ -let log; -/** - * @type {typeof console.log}} - */ -let original_log; - export default test({ mode: ['client'], - before_test() { - log = []; - original_log = console.log; - console.log = (...v) => { - log.push(...v); - }; - }, - after_test() { - console.log = original_log; - }, - async test({ assert }) { - assert.deepEqual(log, ['init']); + async test({ assert, logs }) { + assert.deepEqual(logs, ['init']); } }); diff --git a/packages/svelte/tests/runtime-runes/samples/non-local-mutation-with-binding-3/_config.js b/packages/svelte/tests/runtime-runes/samples/non-local-mutation-with-binding-3/_config.js index b4e2084871..6fc699efb6 100644 --- a/packages/svelte/tests/runtime-runes/samples/non-local-mutation-with-binding-3/_config.js +++ b/packages/svelte/tests/runtime-runes/samples/non-local-mutation-with-binding-3/_config.js @@ -1,15 +1,9 @@ import { flushSync } from 'svelte'; import { test } from '../../test'; -/** @type {typeof console.warn} */ -let warn; - /** @type {typeof console.trace} */ let trace; -/** @type {any[]} */ -let warnings = []; - export default test({ html: ``, @@ -18,24 +12,16 @@ export default test({ }, before_test: () => { - warn = console.warn; trace = console.trace; - console.warn = (...args) => { - warnings.push(...args); - }; - console.trace = () => {}; }, after_test: () => { - console.warn = warn; console.trace = trace; - - warnings = []; }, - async test({ assert, target }) { + async test({ assert, target, warnings }) { const [btn1, btn2] = target.querySelectorAll('button'); flushSync(() => btn1.click()); diff --git a/packages/svelte/tests/runtime-runes/samples/nullish-operator/_config.js b/packages/svelte/tests/runtime-runes/samples/nullish-operator/_config.js index 11e729c3c7..940af7980e 100644 --- a/packages/svelte/tests/runtime-runes/samples/nullish-operator/_config.js +++ b/packages/svelte/tests/runtime-runes/samples/nullish-operator/_config.js @@ -1,14 +1,9 @@ import { test } from '../../test'; -import { log } from './log.js'; export default test({ - before_test() { - log.length = 0; - }, - - async test({ assert }) { + async test({ assert, logs }) { await Promise.resolve(); await Promise.resolve(); - assert.deepEqual(log, ['a1: ', true, 'b1: ', true]); + assert.deepEqual(logs, ['a1: ', true, 'b1: ', true]); } }); diff --git a/packages/svelte/tests/runtime-runes/samples/nullish-operator/log.js b/packages/svelte/tests/runtime-runes/samples/nullish-operator/log.js deleted file mode 100644 index d3df521f4d..0000000000 --- a/packages/svelte/tests/runtime-runes/samples/nullish-operator/log.js +++ /dev/null @@ -1,2 +0,0 @@ -/** @type {any[]} */ -export const log = []; diff --git a/packages/svelte/tests/runtime-runes/samples/nullish-operator/main.svelte b/packages/svelte/tests/runtime-runes/samples/nullish-operator/main.svelte index a98c4b4f39..801d568ffb 100644 --- a/packages/svelte/tests/runtime-runes/samples/nullish-operator/main.svelte +++ b/packages/svelte/tests/runtime-runes/samples/nullish-operator/main.svelte @@ -1,15 +1,13 @@ diff --git a/packages/svelte/tests/runtime-runes/samples/pre-effect/_config.js b/packages/svelte/tests/runtime-runes/samples/pre-effect/_config.js index 1e6333bdeb..384356dc07 100644 --- a/packages/svelte/tests/runtime-runes/samples/pre-effect/_config.js +++ b/packages/svelte/tests/runtime-runes/samples/pre-effect/_config.js @@ -1,17 +1,12 @@ import { test } from '../../test'; -import { log } from './log.js'; export default test({ - before_test() { - log.length = 0; - }, - - async test({ assert, target }) { + async test({ assert, target, logs }) { const [b1, b2] = target.querySelectorAll('button'); b1.click(); b2.click(); await Promise.resolve(); - assert.deepEqual(log, [0, 1]); + assert.deepEqual(logs, [0, 1]); } }); diff --git a/packages/svelte/tests/runtime-runes/samples/pre-effect/log.js b/packages/svelte/tests/runtime-runes/samples/pre-effect/log.js deleted file mode 100644 index d3df521f4d..0000000000 --- a/packages/svelte/tests/runtime-runes/samples/pre-effect/log.js +++ /dev/null @@ -1,2 +0,0 @@ -/** @type {any[]} */ -export const log = []; diff --git a/packages/svelte/tests/runtime-runes/samples/pre-effect/main.svelte b/packages/svelte/tests/runtime-runes/samples/pre-effect/main.svelte index 5245340373..18f2610f6d 100644 --- a/packages/svelte/tests/runtime-runes/samples/pre-effect/main.svelte +++ b/packages/svelte/tests/runtime-runes/samples/pre-effect/main.svelte @@ -1,11 +1,9 @@ diff --git a/packages/svelte/tests/runtime-runes/samples/props-derived-2/Item.svelte b/packages/svelte/tests/runtime-runes/samples/props-derived-2/Item.svelte index 1c2c6e7182..7d5e6cea08 100644 --- a/packages/svelte/tests/runtime-runes/samples/props-derived-2/Item.svelte +++ b/packages/svelte/tests/runtime-runes/samples/props-derived-2/Item.svelte @@ -1,9 +1,7 @@ diff --git a/packages/svelte/tests/runtime-runes/samples/props-derived-2/_config.js b/packages/svelte/tests/runtime-runes/samples/props-derived-2/_config.js index 32b526c9a8..d1518559b8 100644 --- a/packages/svelte/tests/runtime-runes/samples/props-derived-2/_config.js +++ b/packages/svelte/tests/runtime-runes/samples/props-derived-2/_config.js @@ -1,19 +1,14 @@ import { test } from '../../test'; import { flushSync } from 'svelte'; -import { log } from './log.js'; export default test({ - before_test() { - log.length = 0; - }, - - async test({ assert, target }) { - log.length = 0; + async test({ assert, target, logs }) { + logs.length = 0; const input = /** @type {HTMLInputElement} */ (target.querySelector('input')); input.value = '1'; flushSync(() => input.dispatchEvent(new window.Event('input'))); - assert.deepEqual(log, ['active changed', false, 'active changed', true]); + assert.deepEqual(logs, ['active changed', false, 'active changed', true]); } }); diff --git a/packages/svelte/tests/runtime-runes/samples/props-derived-2/log.js b/packages/svelte/tests/runtime-runes/samples/props-derived-2/log.js deleted file mode 100644 index d3df521f4d..0000000000 --- a/packages/svelte/tests/runtime-runes/samples/props-derived-2/log.js +++ /dev/null @@ -1,2 +0,0 @@ -/** @type {any[]} */ -export const log = []; diff --git a/packages/svelte/tests/runtime-runes/samples/props-equality/main.svelte b/packages/svelte/tests/runtime-runes/samples/props-equality/main.svelte index 7c7ee0c31e..9594cc406c 100644 --- a/packages/svelte/tests/runtime-runes/samples/props-equality/main.svelte +++ b/packages/svelte/tests/runtime-runes/samples/props-equality/main.svelte @@ -11,7 +11,7 @@ {/each} {#each items as item (item.name)} - {console.log('hello'); item.name = item.name + '+'}} /> + item.name = item.name + '+'} /> {/each} {#each items as item} diff --git a/packages/svelte/tests/runtime-runes/samples/readonly-state/_config.js b/packages/svelte/tests/runtime-runes/samples/readonly-state/_config.js index 1e6333bdeb..384356dc07 100644 --- a/packages/svelte/tests/runtime-runes/samples/readonly-state/_config.js +++ b/packages/svelte/tests/runtime-runes/samples/readonly-state/_config.js @@ -1,17 +1,12 @@ import { test } from '../../test'; -import { log } from './log.js'; export default test({ - before_test() { - log.length = 0; - }, - - async test({ assert, target }) { + async test({ assert, target, logs }) { const [b1, b2] = target.querySelectorAll('button'); b1.click(); b2.click(); await Promise.resolve(); - assert.deepEqual(log, [0, 1]); + assert.deepEqual(logs, [0, 1]); } }); diff --git a/packages/svelte/tests/runtime-runes/samples/readonly-state/log.js b/packages/svelte/tests/runtime-runes/samples/readonly-state/log.js deleted file mode 100644 index d3df521f4d..0000000000 --- a/packages/svelte/tests/runtime-runes/samples/readonly-state/log.js +++ /dev/null @@ -1,2 +0,0 @@ -/** @type {any[]} */ -export const log = []; diff --git a/packages/svelte/tests/runtime-runes/samples/readonly-state/main.svelte b/packages/svelte/tests/runtime-runes/samples/readonly-state/main.svelte index 1dde3104be..e92a479c93 100644 --- a/packages/svelte/tests/runtime-runes/samples/readonly-state/main.svelte +++ b/packages/svelte/tests/runtime-runes/samples/readonly-state/main.svelte @@ -1,11 +1,9 @@ diff --git a/packages/svelte/tests/runtime-runes/samples/snippet-reactive-args/_config.js b/packages/svelte/tests/runtime-runes/samples/snippet-reactive-args/_config.js index ffb50aaa53..01c8db2143 100644 --- a/packages/svelte/tests/runtime-runes/samples/snippet-reactive-args/_config.js +++ b/packages/svelte/tests/runtime-runes/samples/snippet-reactive-args/_config.js @@ -6,13 +6,8 @@ export default test({ `, - props: { - get log() { - return []; - } - }, - async test({ assert, target, component }) { + async test({ assert, target, logs }) { const [toggle, increment] = target.querySelectorAll('button'); await increment?.click(); @@ -24,7 +19,7 @@ export default test({ ` ); - assert.deepEqual(component.log, []); + assert.deepEqual(logs, []); await toggle?.click(); assert.htmlEqual( @@ -35,7 +30,7 @@ export default test({ ` ); - assert.deepEqual(component.log, [1]); + assert.deepEqual(logs, [1]); await increment?.click(); assert.htmlEqual( @@ -46,7 +41,7 @@ export default test({ ` ); - assert.deepEqual(component.log, [1]); + assert.deepEqual(logs, [1]); await toggle?.click(); assert.htmlEqual( @@ -57,6 +52,6 @@ export default test({ ` ); - assert.deepEqual(component.log, [1]); + assert.deepEqual(logs, [1]); } }); diff --git a/packages/svelte/tests/runtime-runes/samples/snippet-reactive-args/inner.svelte b/packages/svelte/tests/runtime-runes/samples/snippet-reactive-args/inner.svelte index bbe3a61043..3980b77408 100644 --- a/packages/svelte/tests/runtime-runes/samples/snippet-reactive-args/inner.svelte +++ b/packages/svelte/tests/runtime-runes/samples/snippet-reactive-args/inner.svelte @@ -1,6 +1,6 @@

component: {count}

diff --git a/packages/svelte/tests/runtime-runes/samples/snippet-reactive-args/main.svelte b/packages/svelte/tests/runtime-runes/samples/snippet-reactive-args/main.svelte index 682fca22dc..90e04b45a5 100644 --- a/packages/svelte/tests/runtime-runes/samples/snippet-reactive-args/main.svelte +++ b/packages/svelte/tests/runtime-runes/samples/snippet-reactive-args/main.svelte @@ -1,8 +1,6 @@ diff --git a/packages/svelte/tests/runtime-runes/samples/text-multiple-call-expression/_config.js b/packages/svelte/tests/runtime-runes/samples/text-multiple-call-expression/_config.js index d10b5e0790..064eca9aa3 100644 --- a/packages/svelte/tests/runtime-runes/samples/text-multiple-call-expression/_config.js +++ b/packages/svelte/tests/runtime-runes/samples/text-multiple-call-expression/_config.js @@ -1,13 +1,10 @@ import { flushSync } from 'svelte'; import { test } from '../../test'; -import { log } from './log.js'; export default test({ - before_test() { - log.length = 0; - }, + async test({ assert, target, logs }) { + assert.deepEqual(logs, ['x', 'y']); - async test({ assert, target }) { const [b1, b2] = target.querySelectorAll('button'); flushSync(() => { @@ -18,6 +15,6 @@ export default test({ b2.click(); }); - assert.deepEqual(log, ['x', 'y', 'x', 'y']); + assert.deepEqual(logs, ['x', 'y', 'x', 'y']); } }); diff --git a/packages/svelte/tests/runtime-runes/samples/text-multiple-call-expression/log.js b/packages/svelte/tests/runtime-runes/samples/text-multiple-call-expression/log.js deleted file mode 100644 index d3df521f4d..0000000000 --- a/packages/svelte/tests/runtime-runes/samples/text-multiple-call-expression/log.js +++ /dev/null @@ -1,2 +0,0 @@ -/** @type {any[]} */ -export const log = []; diff --git a/packages/svelte/tests/runtime-runes/samples/text-multiple-call-expression/main.svelte b/packages/svelte/tests/runtime-runes/samples/text-multiple-call-expression/main.svelte index 83ed148e44..a44130d944 100644 --- a/packages/svelte/tests/runtime-runes/samples/text-multiple-call-expression/main.svelte +++ b/packages/svelte/tests/runtime-runes/samples/text-multiple-call-expression/main.svelte @@ -1,16 +1,14 @@