From 27b46a98cee621752ee99ce1d3a3aad9673c0e9a Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Sun, 13 Jul 2025 17:40:48 -0400 Subject: [PATCH] update some tests --- .../samples/async-abort-signal/_config.js | 2 +- .../_config.js | 2 +- .../samples/async-derived-module/_config.js | 2 +- .../samples/async-each/_config.js | 55 +++++++++++------- .../samples/async-each/main.svelte | 8 ++- .../samples/async-expression/_config.js | 2 +- .../samples/async-html-tag/_config.js | 57 ++++++++++++------- .../samples/async-html-tag/main.svelte | 8 ++- .../runtime-runes/samples/async-if/_config.js | 12 ---- .../samples/async-key/_config.js | 54 +++++++++--------- .../samples/async-key/main.svelte | 8 ++- 11 files changed, 122 insertions(+), 88 deletions(-) diff --git a/packages/svelte/tests/runtime-runes/samples/async-abort-signal/_config.js b/packages/svelte/tests/runtime-runes/samples/async-abort-signal/_config.js index b721f4dd62..a947a91ab8 100644 --- a/packages/svelte/tests/runtime-runes/samples/async-abort-signal/_config.js +++ b/packages/svelte/tests/runtime-runes/samples/async-abort-signal/_config.js @@ -2,7 +2,7 @@ import { settled, tick } from 'svelte'; import { test } from '../../test'; export default test({ - async test({ assert, target, logs, variant }) { + async test({ assert, target, logs }) { const [reset, resolve] = target.querySelectorAll('button'); reset.click(); diff --git a/packages/svelte/tests/runtime-runes/samples/async-block-reject-each-during-init/_config.js b/packages/svelte/tests/runtime-runes/samples/async-block-reject-each-during-init/_config.js index cd89439a72..c5dae7fee2 100644 --- a/packages/svelte/tests/runtime-runes/samples/async-block-reject-each-during-init/_config.js +++ b/packages/svelte/tests/runtime-runes/samples/async-block-reject-each-during-init/_config.js @@ -2,7 +2,7 @@ import { tick } from 'svelte'; import { test } from '../../test'; export default test({ - async test({ assert, target, errors }) { + async test({ assert, target }) { const [increment, resolve, reject] = target.querySelectorAll('button'); increment.click(); 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 b16ef652ae..7a20ecda92 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, settled, tick } from 'svelte'; +import { flushSync, tick } from 'svelte'; import { deferred } from '../../../../src/internal/shared/utils.js'; import { test } from '../../test'; 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 9dde2beb39..50aa055130 100644 --- a/packages/svelte/tests/runtime-runes/samples/async-each/_config.js +++ b/packages/svelte/tests/runtime-runes/samples/async-each/_config.js @@ -1,33 +1,48 @@ import { tick } from 'svelte'; -import { deferred } from '../../../../src/internal/shared/utils.js'; import { test } from '../../test'; -/** @type {ReturnType} */ -let d; - export default test({ - html: `

pending

`, - - get props() { - d = deferred(); + html: ` + + + +

pending

+ `, - return { - promise: d.promise - }; - }, + async test({ assert, target }) { + const [reset, abc, defg] = target.querySelectorAll('button'); - async test({ assert, target, component }) { - d.resolve(['a', 'b', 'c']); + abc.click(); await tick(); - assert.htmlEqual(target.innerHTML, '

a

b

c

'); + assert.htmlEqual( + target.innerHTML, + ` + + + +

a

b

c

` + ); - d = deferred(); - component.promise = d.promise; + reset.click(); await tick(); - assert.htmlEqual(target.innerHTML, '

a

b

c

'); + assert.htmlEqual( + target.innerHTML, + ` + + + +

a

b

c

` + ); - d.resolve(['d', 'e', 'f', 'g']); + defg.click(); await tick(); - assert.htmlEqual(target.innerHTML, '

d

e

f

g

'); + assert.htmlEqual( + target.innerHTML, + ` + + + +

d

e

f

g

` + ); } }); diff --git a/packages/svelte/tests/runtime-runes/samples/async-each/main.svelte b/packages/svelte/tests/runtime-runes/samples/async-each/main.svelte index 9b59d57b05..8e4412811a 100644 --- a/packages/svelte/tests/runtime-runes/samples/async-each/main.svelte +++ b/packages/svelte/tests/runtime-runes/samples/async-each/main.svelte @@ -1,9 +1,13 @@ + + + + - {#each await promise as item} + {#each await deferred.promise as item}

{item}

{/each} 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 d626569ba2..3a66ea709f 100644 --- a/packages/svelte/tests/runtime-runes/samples/async-expression/_config.js +++ b/packages/svelte/tests/runtime-runes/samples/async-expression/_config.js @@ -1,4 +1,4 @@ -import { flushSync, tick } from 'svelte'; +import { tick } from 'svelte'; import { test } from '../../test'; export default test({ 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 22b8b2a1c4..f5b1f3d2c4 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,32 +1,51 @@ import { tick } from 'svelte'; -import { deferred } from '../../../../src/internal/shared/utils.js'; import { test } from '../../test'; -/** @type {ReturnType} */ -let d; - export default test({ - html: `

pending

`, - - get props() { - d = deferred(); + html: ` + + + +

pending

+ `, - return { - promise: d.promise - }; - }, + async test({ assert, target }) { + const [reset, hello, goodbye] = target.querySelectorAll('button'); - async test({ assert, target, component }) { - d.resolve('hello'); + hello.click(); await tick(); - assert.htmlEqual(target.innerHTML, '

hello

'); + assert.htmlEqual( + target.innerHTML, + ` + + + +

hello

+ ` + ); - component.promise = (d = deferred()).promise; + reset.click(); await tick(); - assert.htmlEqual(target.innerHTML, '

hello

'); + assert.htmlEqual( + target.innerHTML, + ` + + + +

hello

+ ` + ); - d.resolve('wheee'); + goodbye.click(); await tick(); - assert.htmlEqual(target.innerHTML, '

wheee

'); + assert.htmlEqual( + target.innerHTML, + ` + + + +

goodbye

+ ` + ); } }); diff --git a/packages/svelte/tests/runtime-runes/samples/async-html-tag/main.svelte b/packages/svelte/tests/runtime-runes/samples/async-html-tag/main.svelte index f5aa363731..980bb16d5c 100644 --- a/packages/svelte/tests/runtime-runes/samples/async-html-tag/main.svelte +++ b/packages/svelte/tests/runtime-runes/samples/async-html-tag/main.svelte @@ -1,9 +1,13 @@ + + + + -

{@html await promise}

+

{@html await deferred.promise}

{#snippet pending()}

pending

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 a4bee8c995..3cd67952c3 100644 --- a/packages/svelte/tests/runtime-runes/samples/async-if/_config.js +++ b/packages/svelte/tests/runtime-runes/samples/async-if/_config.js @@ -1,21 +1,9 @@ import { tick } from 'svelte'; -import { deferred } from '../../../../src/internal/shared/utils.js'; import { test } from '../../test'; -/** @type {ReturnType} */ -let d; - export default test({ html: `

pending

`, - get props() { - d = deferred(); - - return { - promise: d.promise - }; - }, - async test({ assert, target }) { const [reset, t, f] = target.querySelectorAll('button'); 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 bda9227054..e7e5db3dd8 100644 --- a/packages/svelte/tests/runtime-runes/samples/async-key/_config.js +++ b/packages/svelte/tests/runtime-runes/samples/async-key/_config.js @@ -1,46 +1,46 @@ import { tick } from 'svelte'; -import { deferred } from '../../../../src/internal/shared/utils.js'; import { test } from '../../test'; -/** @type {ReturnType} */ -let d; - export default test({ - html: `

pending

`, - - get props() { - d = deferred(); - - return { - promise: d.promise - }; - }, - - async test({ assert, target, component }) { - d.resolve(1); + html: ` + + + +

pending

+ `, + + async test({ assert, target }) { + const [reset, one, two] = target.querySelectorAll('button'); + + const html = ` + + + +

hello

+ `; + + one.click(); await tick(); - assert.htmlEqual(target.innerHTML, '

hello

'); + assert.htmlEqual(target.innerHTML, html); const h1 = target.querySelector('h1'); - d = deferred(); - component.promise = d.promise; + reset.click(); await tick(); - assert.htmlEqual(target.innerHTML, '

hello

'); + assert.htmlEqual(target.innerHTML, html); - d.resolve(1); + one.click(); await tick(); - assert.htmlEqual(target.innerHTML, '

hello

'); + assert.htmlEqual(target.innerHTML, html); assert.equal(target.querySelector('h1'), h1); - d = deferred(); - component.promise = d.promise; + reset.click(); await tick(); - assert.htmlEqual(target.innerHTML, '

hello

'); + assert.htmlEqual(target.innerHTML, html); - d.resolve(2); + two.click(); await tick(); - assert.htmlEqual(target.innerHTML, '

hello

'); + assert.htmlEqual(target.innerHTML, html); assert.notEqual(target.querySelector('h1'), h1); } }); diff --git a/packages/svelte/tests/runtime-runes/samples/async-key/main.svelte b/packages/svelte/tests/runtime-runes/samples/async-key/main.svelte index 7cac0f8542..5fbdbd47d0 100644 --- a/packages/svelte/tests/runtime-runes/samples/async-key/main.svelte +++ b/packages/svelte/tests/runtime-runes/samples/async-key/main.svelte @@ -1,9 +1,13 @@ + + + + - {#key await promise} + {#key await deferred.promise}

hello

{/key}