diff --git a/packages/svelte/tests/runtime-runes/samples/async-derived-module/_config.js b/packages/svelte/tests/runtime-runes/samples/async-derived-module/_config.js index 30adf19581..b16ef652ae 100644 --- a/packages/svelte/tests/runtime-runes/samples/async-derived-module/_config.js +++ b/packages/svelte/tests/runtime-runes/samples/async-derived-module/_config.js @@ -1,4 +1,4 @@ -import { flushSync, tick } from 'svelte'; +import { flushSync, settled, tick } from 'svelte'; import { deferred } from '../../../../src/internal/shared/utils.js'; import { test } from '../../test'; @@ -19,6 +19,8 @@ export default test({ async test({ assert, target, component, logs }) { d.resolve(42); + + // TODO why is this necessary? why isn't `await tick()` enough? await Promise.resolve(); await Promise.resolve(); await Promise.resolve(); @@ -32,9 +34,6 @@ export default test({ assert.htmlEqual(target.innerHTML, '

42

'); component.num = 2; - await Promise.resolve(); - await Promise.resolve(); - await Promise.resolve(); await tick(); assert.htmlEqual(target.innerHTML, '

84

'); @@ -44,8 +43,6 @@ export default test({ assert.htmlEqual(target.innerHTML, '

84

'); d.resolve(43); - await Promise.resolve(); - await Promise.resolve(); await tick(); assert.htmlEqual(target.innerHTML, '

86

'); diff --git a/packages/svelte/tests/runtime-runes/samples/async-derived-unchanging/_config.js b/packages/svelte/tests/runtime-runes/samples/async-derived-unchanging/_config.js index 4232136964..016c311f98 100644 --- a/packages/svelte/tests/runtime-runes/samples/async-derived-unchanging/_config.js +++ b/packages/svelte/tests/runtime-runes/samples/async-derived-unchanging/_config.js @@ -1,16 +1,11 @@ -import { flushSync } from 'svelte'; +import { flushSync, tick } from 'svelte'; import { test } from '../../test'; export default test({ html: `

pending...

`, async test({ assert, target }) { - await Promise.resolve(); - await Promise.resolve(); - await Promise.resolve(); - await Promise.resolve(); - await Promise.resolve(); - await Promise.resolve(); + await tick(); assert.htmlEqual( target.innerHTML, @@ -30,10 +25,7 @@ export default test({ for (let i = 1; i < 5; i += 1) { shift.click(); - await Promise.resolve(); - await Promise.resolve(); - await Promise.resolve(); - await Promise.resolve(); + await tick(); assert.equal(p.innerHTML, `${i}: ${Math.min(i, 3)}`); } diff --git a/packages/svelte/tests/runtime-runes/samples/async-each-await-item/_config.js b/packages/svelte/tests/runtime-runes/samples/async-each-await-item/_config.js index 52df1275a9..54aa68eeb2 100644 --- a/packages/svelte/tests/runtime-runes/samples/async-each-await-item/_config.js +++ b/packages/svelte/tests/runtime-runes/samples/async-each-await-item/_config.js @@ -1,4 +1,4 @@ -import { flushSync, tick } from 'svelte'; +import { tick } from 'svelte'; import { test } from '../../test'; export default test({ @@ -7,25 +7,21 @@ export default test({ async test({ assert, target }) { const [button1, button2, button3] = target.querySelectorAll('button'); - flushSync(() => button1.click()); - await Promise.resolve(); - await Promise.resolve(); + button1.click(); await tick(); - flushSync(); assert.htmlEqual( target.innerHTML, '

a

b

c

' ); - flushSync(() => button2.click()); + button2.click(); await tick(); assert.htmlEqual( target.innerHTML, '

a

b

c

' ); - flushSync(() => button3.click()); - await Promise.resolve(); + button3.click(); await tick(); assert.htmlEqual( target.innerHTML, diff --git a/packages/svelte/tests/runtime-runes/samples/async-each/_config.js b/packages/svelte/tests/runtime-runes/samples/async-each/_config.js index b28d310565..9dde2beb39 100644 --- a/packages/svelte/tests/runtime-runes/samples/async-each/_config.js +++ b/packages/svelte/tests/runtime-runes/samples/async-each/_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(['a', 'b', 'c']); - await Promise.resolve(); - await Promise.resolve(); await tick(); - flushSync(); assert.htmlEqual(target.innerHTML, '

a

b

c

'); d = deferred(); diff --git a/packages/svelte/tests/runtime-runes/samples/async-error-recovery/_config.js b/packages/svelte/tests/runtime-runes/samples/async-error-recovery/_config.js index 91784f6747..1613bf9c61 100644 --- a/packages/svelte/tests/runtime-runes/samples/async-error-recovery/_config.js +++ b/packages/svelte/tests/runtime-runes/samples/async-error-recovery/_config.js @@ -1,4 +1,4 @@ -import { flushSync, tick } from 'svelte'; +import { tick } from 'svelte'; import { test } from '../../test'; export default test({ @@ -13,12 +13,7 @@ export default test({ }, async test({ assert, target }) { - await Promise.resolve(); - await Promise.resolve(); - await Promise.resolve(); - await Promise.resolve(); - await Promise.resolve(); - await Promise.resolve(); + await tick(); assert.htmlEqual( target.innerHTML, @@ -31,10 +26,8 @@ export default test({ let [button] = target.querySelectorAll('button'); let [p] = target.querySelectorAll('p'); - flushSync(() => button.click()); - await Promise.resolve(); - await Promise.resolve(); - await Promise.resolve(); + button.click(); + await tick(); assert.htmlEqual( target.innerHTML, ` @@ -43,10 +36,8 @@ export default test({ ` ); - flushSync(() => button.click()); - await Promise.resolve(); - await Promise.resolve(); - await Promise.resolve(); + button.click(); + await tick(); assert.htmlEqual( target.innerHTML, ` @@ -55,10 +46,8 @@ export default test({ ` ); - flushSync(() => button.click()); - await Promise.resolve(); - await Promise.resolve(); - await Promise.resolve(); + button.click(); + await tick(); assert.htmlEqual( target.innerHTML, ` @@ -69,15 +58,11 @@ export default test({ const [button1, button2] = target.querySelectorAll('button'); - flushSync(() => button1.click()); - await Promise.resolve(); + button1.click(); + await tick(); - flushSync(() => button2.click()); - await Promise.resolve(); - await Promise.resolve(); - await Promise.resolve(); - await Promise.resolve(); - await Promise.resolve(); + button2.click(); + await tick(); [p] = target.querySelectorAll('p'); @@ -89,10 +74,8 @@ export default test({ ` ); - flushSync(() => button1.click()); - await Promise.resolve(); - await Promise.resolve(); - await Promise.resolve(); + button1.click(); + await tick(); assert.htmlEqual( target.innerHTML, ` diff --git a/packages/svelte/tests/runtime-runes/samples/async-error/_config.js b/packages/svelte/tests/runtime-runes/samples/async-error/_config.js index 61cfe45104..dfbd238eeb 100644 --- a/packages/svelte/tests/runtime-runes/samples/async-error/_config.js +++ b/packages/svelte/tests/runtime-runes/samples/async-error/_config.js @@ -1,4 +1,4 @@ -import { flushSync, tick } from 'svelte'; +import { tick } from 'svelte'; import { test } from '../../test'; export default test({ @@ -7,29 +7,24 @@ export default test({ async test({ assert, target }) { let [button1, button2, button3] = target.querySelectorAll('button'); - flushSync(() => button1.click()); - await Promise.resolve(); - await Promise.resolve(); - await Promise.resolve(); - await Promise.resolve(); - flushSync(); + button1.click(); + await tick(); assert.htmlEqual( target.innerHTML, '

oops!

' ); - flushSync(() => button2.click()); + button2.click(); const reset = /** @type {HTMLButtonElement} */ (target.querySelector('[data-id="reset"]')); - flushSync(() => reset.click()); + reset.click(); assert.htmlEqual( target.innerHTML, '

pending

' ); - flushSync(() => button3.click()); - await Promise.resolve(); + button3.click(); await tick(); assert.htmlEqual( target.innerHTML, diff --git a/packages/svelte/tests/runtime-runes/samples/async-expression/_config.js b/packages/svelte/tests/runtime-runes/samples/async-expression/_config.js index c44d112625..d626569ba2 100644 --- a/packages/svelte/tests/runtime-runes/samples/async-expression/_config.js +++ b/packages/svelte/tests/runtime-runes/samples/async-expression/_config.js @@ -12,12 +12,9 @@ export default test({ async test({ assert, target, raf }) { const [reset, hello, goodbye] = target.querySelectorAll('button'); - flushSync(() => hello.click()); + hello.click(); raf.tick(0); - await Promise.resolve(); - await Promise.resolve(); await tick(); - flushSync(); assert.htmlEqual( target.innerHTML, ` @@ -28,7 +25,7 @@ export default test({ ` ); - flushSync(() => reset.click()); + reset.click(); raf.tick(0); await tick(); assert.htmlEqual( @@ -42,7 +39,7 @@ export default test({ ` ); - flushSync(() => goodbye.click()); + goodbye.click(); await Promise.resolve(); raf.tick(0); await tick(); diff --git a/packages/svelte/tests/runtime-runes/samples/async-html-tag/_config.js b/packages/svelte/tests/runtime-runes/samples/async-html-tag/_config.js index 6cded1a1d1..22b8b2a1c4 100644 --- a/packages/svelte/tests/runtime-runes/samples/async-html-tag/_config.js +++ b/packages/svelte/tests/runtime-runes/samples/async-html-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-if/_config.js b/packages/svelte/tests/runtime-runes/samples/async-if/_config.js index 0bf9152dca..a4bee8c995 100644 --- a/packages/svelte/tests/runtime-runes/samples/async-if/_config.js +++ b/packages/svelte/tests/runtime-runes/samples/async-if/_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'; @@ -19,24 +19,21 @@ export default test({ async test({ assert, target }) { const [reset, t, f] = target.querySelectorAll('button'); - flushSync(() => t.click()); - await Promise.resolve(); - await Promise.resolve(); + t.click(); await tick(); - flushSync(); assert.htmlEqual( target.innerHTML, '

yes

' ); - flushSync(() => reset.click()); + reset.click(); await tick(); assert.htmlEqual( target.innerHTML, '

yes

' ); - flushSync(() => f.click()); + f.click(); await tick(); assert.htmlEqual( target.innerHTML, diff --git a/packages/svelte/tests/runtime-runes/samples/async-key/_config.js b/packages/svelte/tests/runtime-runes/samples/async-key/_config.js index 293ac9357a..bda9227054 100644 --- a/packages/svelte/tests/runtime-runes/samples/async-key/_config.js +++ b/packages/svelte/tests/runtime-runes/samples/async-key/_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(1); - await Promise.resolve(); - await Promise.resolve(); await tick(); - flushSync(); assert.htmlEqual(target.innerHTML, '

hello

'); const h1 = target.querySelector('h1'); diff --git a/packages/svelte/tests/runtime-runes/samples/async-linear-order-different-deriveds/_config.js b/packages/svelte/tests/runtime-runes/samples/async-linear-order-different-deriveds/_config.js index e4d6979acf..cb8e0cfca9 100644 --- a/packages/svelte/tests/runtime-runes/samples/async-linear-order-different-deriveds/_config.js +++ b/packages/svelte/tests/runtime-runes/samples/async-linear-order-different-deriveds/_config.js @@ -1,4 +1,4 @@ -import { flushSync, settled, tick } from 'svelte'; +import { tick } from 'svelte'; import { test } from '../../test'; export default test({ @@ -7,10 +7,7 @@ export default test({ async test({ assert, target }) { const [both, a, b] = target.querySelectorAll('button'); - await Promise.resolve(); - await Promise.resolve(); - await Promise.resolve(); - await Promise.resolve(); + await tick(); assert.htmlEqual( target.innerHTML, @@ -21,12 +18,10 @@ export default test({ ` ); - flushSync(() => both.click()); - flushSync(() => b.click()); + both.click(); + b.click(); - await Promise.resolve(); - await Promise.resolve(); - await Promise.resolve(); + await tick(); assert.htmlEqual( target.innerHTML, diff --git a/packages/svelte/tests/runtime-runes/samples/async-linear-order-same-derived/_config.js b/packages/svelte/tests/runtime-runes/samples/async-linear-order-same-derived/_config.js index 76bfbe56d6..5e522ebdb5 100644 --- a/packages/svelte/tests/runtime-runes/samples/async-linear-order-same-derived/_config.js +++ b/packages/svelte/tests/runtime-runes/samples/async-linear-order-same-derived/_config.js @@ -5,12 +5,8 @@ export default test({ async test({ assert, target }) { const [a, b, reset1, reset2, resolve1, resolve2] = target.querySelectorAll('button'); - flushSync(() => resolve1.click()); - await Promise.resolve(); - await Promise.resolve(); - await Promise.resolve(); + resolve1.click(); await tick(); - flushSync(); const p = /** @type {HTMLElement} */ (target.querySelector('#test')); @@ -21,21 +17,13 @@ export default test({ flushSync(() => reset2.click()); flushSync(() => b.click()); - flushSync(() => resolve2.click()); - await Promise.resolve(); - await Promise.resolve(); - await Promise.resolve(); + resolve2.click(); await tick(); - flushSync(); assert.htmlEqual(p.innerHTML, '1 + 2 = 3'); - flushSync(() => resolve1.click()); - await Promise.resolve(); - await Promise.resolve(); - await Promise.resolve(); + resolve1.click(); await tick(); - flushSync(); assert.htmlEqual(p.innerHTML, '2 + 3 = 5'); } diff --git a/packages/svelte/tests/runtime-runes/samples/async-prop/_config.js b/packages/svelte/tests/runtime-runes/samples/async-prop/_config.js index 570b22abd4..ef4c453b26 100644 --- a/packages/svelte/tests/runtime-runes/samples/async-prop/_config.js +++ b/packages/svelte/tests/runtime-runes/samples/async-prop/_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

'); d = deferred(); diff --git a/packages/svelte/tests/runtime-runes/samples/async-reactivity-loss/_config.js b/packages/svelte/tests/runtime-runes/samples/async-reactivity-loss/_config.js index 4ed40d015b..5de300a74a 100644 --- a/packages/svelte/tests/runtime-runes/samples/async-reactivity-loss/_config.js +++ b/packages/svelte/tests/runtime-runes/samples/async-reactivity-loss/_config.js @@ -1,4 +1,4 @@ -import { flushSync, tick } from 'svelte'; +import { tick } from 'svelte'; import { test } from '../../test'; export default test({ @@ -9,16 +9,7 @@ export default test({ html: `

pending

`, async test({ assert, target, warnings }) { - await Promise.resolve(); - await Promise.resolve(); - await Promise.resolve(); - await Promise.resolve(); - await Promise.resolve(); - await Promise.resolve(); - await Promise.resolve(); - await Promise.resolve(); await tick(); - flushSync(); assert.htmlEqual(target.innerHTML, '

3

'); assert.deepEqual(warnings, ['Detected reactivity loss']);