Skip to content

Commit a469c39

Browse files
committed
update test to not rely on props
1 parent 4f45033 commit a469c39

File tree

3 files changed

+39
-40
lines changed

3 files changed

+39
-40
lines changed

packages/svelte/tests/runtime-runes/samples/async-derived/Child.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<script>
22
let { promise, num } = $props();
33
4-
let value = $derived((await promise) * num);
4+
let value = $derived(num + (await promise));
55
66
$effect(() => {
77
console.log(`$effect ${value} ${num}`);
Lines changed: 30 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,63 +1,56 @@
11
import { flushSync, tick } from 'svelte';
2-
import { deferred } from '../../../../src/internal/shared/utils.js';
3-
import { test } from '../../test';
4-
5-
/** @type {ReturnType<typeof deferred>} */
6-
let d;
2+
import { ok, test } from '../../test';
73

84
export default test({
9-
html: `<p>pending</p>`,
10-
11-
get props() {
12-
d = deferred();
5+
html: `
6+
<button>resolve a</button>
7+
<button>resolve b</button>
8+
<button>reset</button>
9+
<button>increment</button>
10+
<p>pending</p>
11+
`,
1312

14-
return {
15-
promise: d.promise,
16-
num: 1
17-
};
18-
},
13+
async test({ assert, target, logs }) {
14+
const [resolve_a, resolve_b, reset, increment] = target.querySelectorAll('button');
1915

20-
async test({ assert, target, component, logs }) {
21-
d.resolve(42);
16+
flushSync(() => resolve_a.click());
2217
await Promise.resolve();
2318
await Promise.resolve();
2419
await Promise.resolve();
2520
await Promise.resolve();
2621
await Promise.resolve();
2722
await Promise.resolve();
2823
flushSync();
29-
assert.htmlEqual(target.innerHTML, '<p>42</p>');
3024

31-
component.num = 2;
32-
await Promise.resolve();
33-
await Promise.resolve();
25+
const p = target.querySelector('p');
26+
ok(p);
27+
assert.htmlEqual(p.innerHTML, '1a');
28+
29+
flushSync(() => increment.click());
3430
await Promise.resolve();
3531
await tick();
36-
assert.htmlEqual(target.innerHTML, '<p>84</p>');
32+
assert.htmlEqual(p.innerHTML, '2a');
3733

38-
d = deferred();
39-
component.promise = d.promise;
40-
await tick();
41-
assert.htmlEqual(target.innerHTML, '<p>84</p>');
34+
flushSync(() => reset.click());
35+
assert.htmlEqual(p.innerHTML, '2a');
4236

43-
d.resolve(43);
44-
await Promise.resolve();
37+
flushSync(() => resolve_b.click());
4538
await Promise.resolve();
4639
await tick();
47-
assert.htmlEqual(target.innerHTML, '<p>86</p>');
40+
assert.htmlEqual(p.innerHTML, '2b');
4841

4942
assert.deepEqual(logs, [
5043
'outside boundary 1',
51-
'$effect.pre 42 1',
52-
'template 42 1',
53-
'$effect 42 1',
54-
'$effect.pre 84 2',
55-
'template 84 2',
44+
'$effect.pre 1a 1',
45+
'template 1a 1',
46+
'$effect 1a 1',
47+
'$effect.pre 2a 2',
48+
'template 2a 2',
5649
'outside boundary 2',
57-
'$effect 84 2',
58-
'$effect.pre 86 2',
59-
'template 86 2',
60-
'$effect 86 2'
50+
'$effect 2a 2',
51+
'$effect.pre 2b 2',
52+
'template 2b 2',
53+
'$effect 2b 2'
6154
]);
6255
}
6356
});

packages/svelte/tests/runtime-runes/samples/async-derived/main.svelte

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,17 @@
11
<script>
22
import Child from './Child.svelte';
33
4-
let { promise, num } = $props();
4+
let deferred = $state(Promise.withResolvers());
5+
let num = $state(1);
56
</script>
67

8+
<button onclick={() => deferred.resolve('a')}>resolve a</button>
9+
<button onclick={() => deferred.resolve('b')}>resolve b</button>
10+
<button onclick={() => deferred = Promise.withResolvers()}>reset</button>
11+
<button onclick={() => num += 1}>increment</button>
12+
713
<svelte:boundary>
8-
<Child {promise} {num} />
14+
<Child promise={deferred.promise} {num} />
915

1016
{#snippet pending()}
1117
<p>pending</p>

0 commit comments

Comments
 (0)