From 0be1f6aca0d20120b71016913bd681edb9fde136 Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Tue, 24 Jun 2025 16:01:10 -0400 Subject: [PATCH] more --- .../samples/async-redirect-initial/_config.js | 13 +++++-------- .../samples/async-redirect/_config.js | 16 ++++++---------- .../samples/async-render-tag/_config.js | 5 +---- .../samples/async-svelte-element/_config.js | 5 +---- .../samples/async-top-level/_config.js | 6 +----- .../samples/async-waterfall-on-init/_config.js | 14 +++----------- .../samples/async-with-sync-derived/_config.js | 12 +++--------- 7 files changed, 20 insertions(+), 51 deletions(-) diff --git a/packages/svelte/tests/runtime-runes/samples/async-redirect-initial/_config.js b/packages/svelte/tests/runtime-runes/samples/async-redirect-initial/_config.js index 1a0a855c12..17bb79af08 100644 --- a/packages/svelte/tests/runtime-runes/samples/async-redirect-initial/_config.js +++ b/packages/svelte/tests/runtime-runes/samples/async-redirect-initial/_config.js @@ -1,4 +1,4 @@ -import { flushSync, tick } from 'svelte'; +import { tick } from 'svelte'; import { test } from '../../test'; export default test({ @@ -17,9 +17,7 @@ export default test({ ` ); - await Promise.resolve(); - await Promise.resolve(); - await Promise.resolve(); + await tick(); assert.htmlEqual( target.innerHTML, @@ -33,11 +31,10 @@ export default test({ ` ); - flushSync(() => ok.click()); + ok.click(); - flushSync(() => b.click()); - await Promise.resolve(); - await Promise.resolve(); + b.click(); + await tick(); assert.htmlEqual( target.innerHTML, diff --git a/packages/svelte/tests/runtime-runes/samples/async-redirect/_config.js b/packages/svelte/tests/runtime-runes/samples/async-redirect/_config.js index c73fdbf268..ebbe642860 100644 --- a/packages/svelte/tests/runtime-runes/samples/async-redirect/_config.js +++ b/packages/svelte/tests/runtime-runes/samples/async-redirect/_config.js @@ -1,10 +1,8 @@ -import { flushSync, tick } from 'svelte'; +import { tick } from 'svelte'; import { test } from '../../test'; export default test({ async test({ assert, target }) { - await Promise.resolve(); - assert.htmlEqual( target.innerHTML, ` @@ -19,9 +17,8 @@ export default test({ const [a, b, c, ok] = target.querySelectorAll('button'); - flushSync(() => b.click()); - await Promise.resolve(); - await Promise.resolve(); + b.click(); + await tick(); assert.htmlEqual( target.innerHTML, @@ -35,11 +32,10 @@ export default test({ ` ); - flushSync(() => ok.click()); + ok.click(); - flushSync(() => b.click()); - await Promise.resolve(); - await Promise.resolve(); + b.click(); + await tick(); assert.htmlEqual( target.innerHTML, diff --git a/packages/svelte/tests/runtime-runes/samples/async-render-tag/_config.js b/packages/svelte/tests/runtime-runes/samples/async-render-tag/_config.js index 6cded1a1d1..22b8b2a1c4 100644 --- a/packages/svelte/tests/runtime-runes/samples/async-render-tag/_config.js +++ b/packages/svelte/tests/runtime-runes/samples/async-render-tag/_config.js @@ -1,4 +1,4 @@ -import { flushSync, tick } from 'svelte'; +import { tick } from 'svelte'; import { deferred } from '../../../../src/internal/shared/utils.js'; import { test } from '../../test'; @@ -18,10 +18,7 @@ export default test({ async test({ assert, target, component }) { d.resolve('hello'); - await Promise.resolve(); - await Promise.resolve(); await tick(); - flushSync(); assert.htmlEqual(target.innerHTML, '

hello

'); component.promise = (d = deferred()).promise; diff --git a/packages/svelte/tests/runtime-runes/samples/async-svelte-element/_config.js b/packages/svelte/tests/runtime-runes/samples/async-svelte-element/_config.js index ea3b91b2a4..558caa6292 100644 --- a/packages/svelte/tests/runtime-runes/samples/async-svelte-element/_config.js +++ b/packages/svelte/tests/runtime-runes/samples/async-svelte-element/_config.js @@ -1,4 +1,4 @@ -import { flushSync, tick } from 'svelte'; +import { tick } from 'svelte'; import { deferred } from '../../../../src/internal/shared/utils.js'; import { test } from '../../test'; @@ -18,10 +18,7 @@ export default test({ async test({ assert, target, component }) { d.resolve('h1'); - await Promise.resolve(); - await Promise.resolve(); await tick(); - flushSync(); assert.htmlEqual(target.innerHTML, '

hello

'); component.promise = (d = deferred()).promise; diff --git a/packages/svelte/tests/runtime-runes/samples/async-top-level/_config.js b/packages/svelte/tests/runtime-runes/samples/async-top-level/_config.js index b593155946..108ee7bef0 100644 --- a/packages/svelte/tests/runtime-runes/samples/async-top-level/_config.js +++ b/packages/svelte/tests/runtime-runes/samples/async-top-level/_config.js @@ -1,4 +1,4 @@ -import { flushSync, tick } from 'svelte'; +import { tick } from 'svelte'; import { deferred } from '../../../../src/internal/shared/utils.js'; import { test } from '../../test'; @@ -18,11 +18,7 @@ export default test({ async test({ assert, target }) { d.resolve('hello'); - await Promise.resolve(); - await Promise.resolve(); - await Promise.resolve(); await tick(); - flushSync(); assert.htmlEqual(target.innerHTML, '

hello

'); } }); diff --git a/packages/svelte/tests/runtime-runes/samples/async-waterfall-on-init/_config.js b/packages/svelte/tests/runtime-runes/samples/async-waterfall-on-init/_config.js index 91c388e0ca..e2c8b851c1 100644 --- a/packages/svelte/tests/runtime-runes/samples/async-waterfall-on-init/_config.js +++ b/packages/svelte/tests/runtime-runes/samples/async-waterfall-on-init/_config.js @@ -1,4 +1,4 @@ -import { flushSync, tick } from 'svelte'; +import { tick } from 'svelte'; import { test } from '../../test'; export default test({ @@ -12,12 +12,8 @@ export default test({ async test({ assert, target }) { const [button1, button2] = target.querySelectorAll('button'); - flushSync(() => button1.click()); - await Promise.resolve(); - await Promise.resolve(); - await Promise.resolve(); + button1.click(); await tick(); - flushSync(); assert.htmlEqual( target.innerHTML, @@ -29,12 +25,8 @@ export default test({ ` ); - flushSync(() => button2.click()); - await Promise.resolve(); - await Promise.resolve(); - await Promise.resolve(); + button2.click(); await tick(); - flushSync(); assert.htmlEqual( target.innerHTML, diff --git a/packages/svelte/tests/runtime-runes/samples/async-with-sync-derived/_config.js b/packages/svelte/tests/runtime-runes/samples/async-with-sync-derived/_config.js index c09d448f9c..837dd976e2 100644 --- a/packages/svelte/tests/runtime-runes/samples/async-with-sync-derived/_config.js +++ b/packages/svelte/tests/runtime-runes/samples/async-with-sync-derived/_config.js @@ -1,14 +1,11 @@ -import { flushSync, settled, tick } from 'svelte'; +import { flushSync, tick } from 'svelte'; import { test } from '../../test'; export default test({ html: `

loading...

`, async test({ assert, target }) { - await Promise.resolve(); - await Promise.resolve(); - await Promise.resolve(); - await Promise.resolve(); + await tick(); assert.htmlEqual( target.innerHTML, @@ -39,10 +36,7 @@ export default test({ ` ); - await Promise.resolve(); - await Promise.resolve(); - await Promise.resolve(); - await Promise.resolve(); + await tick(); assert.htmlEqual( target.innerHTML,