From 84b41ef264ea1b4000fdd21184853f613d3bb69d Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Fri, 26 Jul 2024 20:57:18 -0400 Subject: [PATCH] simplify tests --- .../samples/state-link-class/_config.js | 37 +++++-------------- .../samples/state-link-class/main.svelte | 14 ++----- .../samples/state-link/_config.js | 37 +++++-------------- .../samples/state-link/main.svelte | 11 +----- 4 files changed, 23 insertions(+), 76 deletions(-) diff --git a/packages/svelte/tests/runtime-runes/samples/state-link-class/_config.js b/packages/svelte/tests/runtime-runes/samples/state-link-class/_config.js index 4d81e96afb..4628d4f5b4 100644 --- a/packages/svelte/tests/runtime-runes/samples/state-link-class/_config.js +++ b/packages/svelte/tests/runtime-runes/samples/state-link-class/_config.js @@ -1,38 +1,19 @@ import { flushSync } from 'svelte'; -import { test, ok } from '../../test'; +import { test } from '../../test'; export default test({ - html: `
0
0
`, - ssrHtml: `
0
0
`, + html: ``, test({ assert, target }) { - const [input1, input2] = target.querySelectorAll('input'); - ok(input1); - ok(input2); - assert.equal(input1.value, '0'); - assert.equal(input2.value, '0'); + const [btn1, btn2] = target.querySelectorAll('button'); - const btn = target.querySelector('button'); + flushSync(() => btn1.click()); + assert.htmlEqual(target.innerHTML, ``); - btn?.click(); - flushSync(); - assert.htmlEqual( - target.innerHTML, - `
0
1
` - ); + flushSync(() => btn2.click()); + assert.htmlEqual(target.innerHTML, ``); - assert.equal(input1.value, '0'); - assert.equal(input2.value, '1'); - - const event = new window.Event('input'); - - input1.value = '2'; - input1.dispatchEvent(event); - flushSync(); - - assert.htmlEqual( - target.innerHTML, - `
2
2
` - ); + flushSync(() => btn1.click()); + assert.htmlEqual(target.innerHTML, ``); } }); diff --git a/packages/svelte/tests/runtime-runes/samples/state-link-class/main.svelte b/packages/svelte/tests/runtime-runes/samples/state-link-class/main.svelte index 09549a7c0b..30d8968f8c 100644 --- a/packages/svelte/tests/runtime-runes/samples/state-link-class/main.svelte +++ b/packages/svelte/tests/runtime-runes/samples/state-link-class/main.svelte @@ -1,19 +1,11 @@ - - - - -
{instance.a}
-
{instance.b}
- - + + diff --git a/packages/svelte/tests/runtime-runes/samples/state-link/_config.js b/packages/svelte/tests/runtime-runes/samples/state-link/_config.js index 4d81e96afb..4628d4f5b4 100644 --- a/packages/svelte/tests/runtime-runes/samples/state-link/_config.js +++ b/packages/svelte/tests/runtime-runes/samples/state-link/_config.js @@ -1,38 +1,19 @@ import { flushSync } from 'svelte'; -import { test, ok } from '../../test'; +import { test } from '../../test'; export default test({ - html: `
0
0
`, - ssrHtml: `
0
0
`, + html: ``, test({ assert, target }) { - const [input1, input2] = target.querySelectorAll('input'); - ok(input1); - ok(input2); - assert.equal(input1.value, '0'); - assert.equal(input2.value, '0'); + const [btn1, btn2] = target.querySelectorAll('button'); - const btn = target.querySelector('button'); + flushSync(() => btn1.click()); + assert.htmlEqual(target.innerHTML, ``); - btn?.click(); - flushSync(); - assert.htmlEqual( - target.innerHTML, - `
0
1
` - ); + flushSync(() => btn2.click()); + assert.htmlEqual(target.innerHTML, ``); - assert.equal(input1.value, '0'); - assert.equal(input2.value, '1'); - - const event = new window.Event('input'); - - input1.value = '2'; - input1.dispatchEvent(event); - flushSync(); - - assert.htmlEqual( - target.innerHTML, - `
2
2
` - ); + flushSync(() => btn1.click()); + assert.htmlEqual(target.innerHTML, ``); } }); diff --git a/packages/svelte/tests/runtime-runes/samples/state-link/main.svelte b/packages/svelte/tests/runtime-runes/samples/state-link/main.svelte index e928e37fa0..aaa8d4ecaf 100644 --- a/packages/svelte/tests/runtime-runes/samples/state-link/main.svelte +++ b/packages/svelte/tests/runtime-runes/samples/state-link/main.svelte @@ -3,12 +3,5 @@ let b = $state.link(a); - - - -
{a}
-
{b}
- - + +