Skip to content

Commit 2ae79f3

Browse files
Rich-HarrisRich-Harris
committed
more
1 parent 8d20a9a commit 2ae79f3

File tree

14 files changed

+50
-131
lines changed

14 files changed

+50
-131
lines changed

‎packages/svelte/tests/runtime-runes/samples/async-derived-module/_config.js‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { flushSync, tick } from 'svelte';
1+
import { flushSync, settled, tick } from 'svelte';
22
import { deferred } from '../../../../src/internal/shared/utils.js';
33
import { test } from '../../test';
44

@@ -19,6 +19,8 @@ export default test({
1919

2020
async test({ assert, target, component, logs }) {
2121
d.resolve(42);
22+
23+
// TODO why is this necessary? why isn't `await tick()` enough?
2224
await Promise.resolve();
2325
await Promise.resolve();
2426
await Promise.resolve();
@@ -32,9 +34,6 @@ export default test({
3234
assert.htmlEqual(target.innerHTML, '<p>42</p>');
3335

3436
component.num = 2;
35-
await Promise.resolve();
36-
await Promise.resolve();
37-
await Promise.resolve();
3837
await tick();
3938
assert.htmlEqual(target.innerHTML, '<p>84</p>');
4039

@@ -44,8 +43,6 @@ export default test({
4443
assert.htmlEqual(target.innerHTML, '<p>84</p>');
4544

4645
d.resolve(43);
47-
await Promise.resolve();
48-
await Promise.resolve();
4946
await tick();
5047
assert.htmlEqual(target.innerHTML, '<p>86</p>');
5148

‎packages/svelte/tests/runtime-runes/samples/async-derived-unchanging/_config.js‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,11 @@
1-
import { flushSync } from 'svelte';
1+
import { flushSync, tick } from 'svelte';
22
import { test } from '../../test';
33

44
export default test({
55
html: `<p>pending...</p>`,
66

77
async test({ assert, target }) {
8-
await Promise.resolve();
9-
await Promise.resolve();
10-
await Promise.resolve();
11-
await Promise.resolve();
12-
await Promise.resolve();
13-
await Promise.resolve();
8+
await tick();
149

1510
assert.htmlEqual(
1611
target.innerHTML,
@@ -30,10 +25,7 @@ export default test({
3025

3126
for (let i = 1; i < 5; i += 1) {
3227
shift.click();
33-
await Promise.resolve();
34-
await Promise.resolve();
35-
await Promise.resolve();
36-
await Promise.resolve();
28+
await tick();
3729

3830
assert.equal(p.innerHTML, `${i}: ${Math.min(i, 3)}`);
3931
}

‎packages/svelte/tests/runtime-runes/samples/async-each-await-item/_config.js‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { flushSync, tick } from 'svelte';
1+
import { tick } from 'svelte';
22
import { test } from '../../test';
33

44
export default test({
@@ -7,25 +7,21 @@ export default test({
77
async test({ assert, target }) {
88
const [button1, button2, button3] = target.querySelectorAll('button');
99

10-
flushSync(() => button1.click());
11-
await Promise.resolve();
12-
await Promise.resolve();
10+
button1.click();
1311
await tick();
14-
flushSync();
1512
assert.htmlEqual(
1613
target.innerHTML,
1714
'<button>step 1</button><button>step 2</button><button>step 3</button><p>a</p><p>b</p><p>c</p>'
1815
);
1916

20-
flushSync(() => button2.click());
17+
button2.click();
2118
await tick();
2219
assert.htmlEqual(
2320
target.innerHTML,
2421
'<button>step 1</button><button>step 2</button><button>step 3</button><p>a</p><p>b</p><p>c</p>'
2522
);
2623

27-
flushSync(() => button3.click());
28-
await Promise.resolve();
24+
button3.click();
2925
await tick();
3026
assert.htmlEqual(
3127
target.innerHTML,

‎packages/svelte/tests/runtime-runes/samples/async-each/_config.js‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { flushSync, tick } from 'svelte';
1+
import { tick } from 'svelte';
22
import { deferred } from '../../../../src/internal/shared/utils.js';
33
import { test } from '../../test';
44

@@ -18,10 +18,7 @@ export default test({
1818

1919
async test({ assert, target, component }) {
2020
d.resolve(['a', 'b', 'c']);
21-
await Promise.resolve();
22-
await Promise.resolve();
2321
await tick();
24-
flushSync();
2522
assert.htmlEqual(target.innerHTML, '<p>a</p><p>b</p><p>c</p>');
2623

2724
d = deferred();

‎packages/svelte/tests/runtime-runes/samples/async-error-recovery/_config.js‎

Lines changed: 14 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { flushSync, tick } from 'svelte';
1+
import { tick } from 'svelte';
22
import { test } from '../../test';
33

44
export default test({
@@ -13,12 +13,7 @@ export default test({
1313
},
1414

1515
async test({ assert, target }) {
16-
await Promise.resolve();
17-
await Promise.resolve();
18-
await Promise.resolve();
19-
await Promise.resolve();
20-
await Promise.resolve();
21-
await Promise.resolve();
16+
await tick();
2217

2318
assert.htmlEqual(
2419
target.innerHTML,
@@ -31,10 +26,8 @@ export default test({
3126
let [button] = target.querySelectorAll('button');
3227
let [p] = target.querySelectorAll('p');
3328

34-
flushSync(() => button.click());
35-
await Promise.resolve();
36-
await Promise.resolve();
37-
await Promise.resolve();
29+
button.click();
30+
await tick();
3831
assert.htmlEqual(
3932
target.innerHTML,
4033
`
@@ -43,10 +36,8 @@ export default test({
4336
`
4437
);
4538

46-
flushSync(() => button.click());
47-
await Promise.resolve();
48-
await Promise.resolve();
49-
await Promise.resolve();
39+
button.click();
40+
await tick();
5041
assert.htmlEqual(
5142
target.innerHTML,
5243
`
@@ -55,10 +46,8 @@ export default test({
5546
`
5647
);
5748

58-
flushSync(() => button.click());
59-
await Promise.resolve();
60-
await Promise.resolve();
61-
await Promise.resolve();
49+
button.click();
50+
await tick();
6251
assert.htmlEqual(
6352
target.innerHTML,
6453
`
@@ -69,15 +58,11 @@ export default test({
6958

7059
const [button1, button2] = target.querySelectorAll('button');
7160

72-
flushSync(() => button1.click());
73-
await Promise.resolve();
61+
button1.click();
62+
await tick();
7463

75-
flushSync(() => button2.click());
76-
await Promise.resolve();
77-
await Promise.resolve();
78-
await Promise.resolve();
79-
await Promise.resolve();
80-
await Promise.resolve();
64+
button2.click();
65+
await tick();
8166

8267
[p] = target.querySelectorAll('p');
8368

@@ -89,10 +74,8 @@ export default test({
8974
`
9075
);
9176

92-
flushSync(() => button1.click());
93-
await Promise.resolve();
94-
await Promise.resolve();
95-
await Promise.resolve();
77+
button1.click();
78+
await tick();
9679
assert.htmlEqual(
9780
target.innerHTML,
9881
`

‎packages/svelte/tests/runtime-runes/samples/async-error/_config.js‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { flushSync, tick } from 'svelte';
1+
import { tick } from 'svelte';
22
import { test } from '../../test';
33

44
export default test({
@@ -7,29 +7,24 @@ export default test({
77
async test({ assert, target }) {
88
let [button1, button2, button3] = target.querySelectorAll('button');
99

10-
flushSync(() => button1.click());
11-
await Promise.resolve();
12-
await Promise.resolve();
13-
await Promise.resolve();
14-
await Promise.resolve();
15-
flushSync();
10+
button1.click();
11+
await tick();
1612
assert.htmlEqual(
1713
target.innerHTML,
1814
'<button>step 1</button><button>step 2</button><button>step 3</button><p>oops!</p><button data-id="reset">reset</button>'
1915
);
2016

21-
flushSync(() => button2.click());
17+
button2.click();
2218

2319
const reset = /** @type {HTMLButtonElement} */ (target.querySelector('[data-id="reset"]'));
24-
flushSync(() => reset.click());
20+
reset.click();
2521

2622
assert.htmlEqual(
2723
target.innerHTML,
2824
'<button>step 1</button><button>step 2</button><button>step 3</button><p>pending</p>'
2925
);
3026

31-
flushSync(() => button3.click());
32-
await Promise.resolve();
27+
button3.click();
3328
await tick();
3429
assert.htmlEqual(
3530
target.innerHTML,

‎packages/svelte/tests/runtime-runes/samples/async-expression/_config.js‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,9 @@ export default test({
1212
async test({ assert, target, raf }) {
1313
const [reset, hello, goodbye] = target.querySelectorAll('button');
1414

15-
flushSync(() => hello.click());
15+
hello.click();
1616
raf.tick(0);
17-
await Promise.resolve();
18-
await Promise.resolve();
1917
await tick();
20-
flushSync();
2118
assert.htmlEqual(
2219
target.innerHTML,
2320
`
@@ -28,7 +25,7 @@ export default test({
2825
`
2926
);
3027

31-
flushSync(() => reset.click());
28+
reset.click();
3229
raf.tick(0);
3330
await tick();
3431
assert.htmlEqual(
@@ -42,7 +39,7 @@ export default test({
4239
`
4340
);
4441

45-
flushSync(() => goodbye.click());
42+
goodbye.click();
4643
await Promise.resolve();
4744
raf.tick(0);
4845
await tick();

‎packages/svelte/tests/runtime-runes/samples/async-html-tag/_config.js‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { flushSync, tick } from 'svelte';
1+
import { tick } from 'svelte';
22
import { deferred } from '../../../../src/internal/shared/utils.js';
33
import { test } from '../../test';
44

@@ -18,10 +18,7 @@ export default test({
1818

1919
async test({ assert, target, component }) {
2020
d.resolve('hello');
21-
await Promise.resolve();
22-
await Promise.resolve();
2321
await tick();
24-
flushSync();
2522
assert.htmlEqual(target.innerHTML, '<h1>hello</h1>');
2623

2724
component.promise = (d = deferred()).promise;

‎packages/svelte/tests/runtime-runes/samples/async-if/_config.js‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { flushSync, tick } from 'svelte';
1+
import { tick } from 'svelte';
22
import { deferred } from '../../../../src/internal/shared/utils.js';
33
import { test } from '../../test';
44

@@ -19,24 +19,21 @@ export default test({
1919
async test({ assert, target }) {
2020
const [reset, t, f] = target.querySelectorAll('button');
2121

22-
flushSync(() => t.click());
23-
await Promise.resolve();
24-
await Promise.resolve();
22+
t.click();
2523
await tick();
26-
flushSync();
2724
assert.htmlEqual(
2825
target.innerHTML,
2926
'<button>reset</button><button>true</button><button>false</button><h1>yes</h1>'
3027
);
3128

32-
flushSync(() => reset.click());
29+
reset.click();
3330
await tick();
3431
assert.htmlEqual(
3532
target.innerHTML,
3633
'<button>reset</button><button>true</button><button>false</button><h1>yes</h1>'
3734
);
3835

39-
flushSync(() => f.click());
36+
f.click();
4037
await tick();
4138
assert.htmlEqual(
4239
target.innerHTML,

‎packages/svelte/tests/runtime-runes/samples/async-key/_config.js‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { flushSync, tick } from 'svelte';
1+
import { tick } from 'svelte';
22
import { deferred } from '../../../../src/internal/shared/utils.js';
33
import { test } from '../../test';
44

@@ -18,10 +18,7 @@ export default test({
1818

1919
async test({ assert, target, component }) {
2020
d.resolve(1);
21-
await Promise.resolve();
22-
await Promise.resolve();
2321
await tick();
24-
flushSync();
2522
assert.htmlEqual(target.innerHTML, '<h1>hello</h1>');
2623

2724
const h1 = target.querySelector('h1');

0 commit comments

Comments
 (0)