{value}
+{mirror}
\ No newline at end of file diff --git a/test/runtime/samples/onstate/_config.js b/test/runtime/samples/after-render-triggers-update/_config.js similarity index 55% rename from test/runtime/samples/onstate/_config.js rename to test/runtime/samples/after-render-triggers-update/_config.js index 3ff5de7873..9a4ad53767 100644 --- a/test/runtime/samples/onstate/_config.js +++ b/test/runtime/samples/after-render-triggers-update/_config.js @@ -2,19 +2,19 @@ export default { 'skip-ssr': true, props: { - foo: 'woo!' + value: 'hello!' }, html: ` -woo!
-WOO!
+hello!
+hello!
`, test(assert, component, target) { - component.foo = 'yeah!'; + component.value = 'goodbye!'; assert.htmlEqual(target.innerHTML, ` -yeah!
-YEAH!
+goodbye!
+goodbye!
`); } }; diff --git a/test/runtime/samples/observe-deferred/main.html b/test/runtime/samples/after-render-triggers-update/main.html similarity index 100% rename from test/runtime/samples/observe-deferred/main.html rename to test/runtime/samples/after-render-triggers-update/main.html diff --git a/test/runtime/samples/onrender-chain/Item.html b/test/runtime/samples/before-render-chain/Item.html similarity index 100% rename from test/runtime/samples/onrender-chain/Item.html rename to test/runtime/samples/before-render-chain/Item.html diff --git a/test/runtime/samples/onrender-chain/List.html b/test/runtime/samples/before-render-chain/List.html similarity index 69% rename from test/runtime/samples/onrender-chain/List.html rename to test/runtime/samples/before-render-chain/List.html index f57c179973..645356bd92 100644 --- a/test/runtime/samples/onrender-chain/List.html +++ b/test/runtime/samples/before-render-chain/List.html @@ -1,10 +1,10 @@ diff --git a/test/runtime/samples/before-render-chain/_config.js b/test/runtime/samples/before-render-chain/_config.js new file mode 100644 index 0000000000..3e3f27bd8c --- /dev/null +++ b/test/runtime/samples/before-render-chain/_config.js @@ -0,0 +1,21 @@ +export default { + 'skip-ssr': true, + + html: ` + 3 + 2 + 1 + `, + + async test(assert, component, target) { + await component.list.update(); + + assert.htmlEqual(target.innerHTML, ` + 1 + 2 + 3 + 4 + 5 + `); + } +}; diff --git a/test/runtime/samples/onrender-chain/main.html b/test/runtime/samples/before-render-chain/main.html similarity index 100% rename from test/runtime/samples/onrender-chain/main.html rename to test/runtime/samples/before-render-chain/main.html diff --git a/test/runtime/samples/before-render-prevents-loop/_config.js b/test/runtime/samples/before-render-prevents-loop/_config.js new file mode 100644 index 0000000000..9a4ad53767 --- /dev/null +++ b/test/runtime/samples/before-render-prevents-loop/_config.js @@ -0,0 +1,20 @@ +export default { + 'skip-ssr': true, + + props: { + value: 'hello!' + }, + + html: ` +hello!
+hello!
+ `, + + test(assert, component, target) { + component.value = 'goodbye!'; + assert.htmlEqual(target.innerHTML, ` +goodbye!
+goodbye!
+ `); + } +}; diff --git a/test/runtime/samples/onstate/main.html b/test/runtime/samples/before-render-prevents-loop/main.html similarity index 50% rename from test/runtime/samples/onstate/main.html rename to test/runtime/samples/before-render-prevents-loop/main.html index 9b5afa1c86..d882ec6726 100644 --- a/test/runtime/samples/onstate/main.html +++ b/test/runtime/samples/before-render-prevents-loop/main.html @@ -1,13 +1,13 @@ -{foo}
-{bar}
\ No newline at end of file +{value}
+{mirror}
\ No newline at end of file diff --git a/test/runtime/samples/onstate-before-render/_config.js b/test/runtime/samples/lifecycle-render-order/_config.js similarity index 86% rename from test/runtime/samples/onstate-before-render/_config.js rename to test/runtime/samples/lifecycle-render-order/_config.js index 9efd7abcbc..f83f1f1c80 100644 --- a/test/runtime/samples/onstate-before-render/_config.js +++ b/test/runtime/samples/lifecycle-render-order/_config.js @@ -7,8 +7,8 @@ export default { assert.deepEqual(order, [ 'beforeRender', 'render', - 'oncreate', - 'afterRender' + 'afterRender', + 'onMount' ]); order.length = 0; diff --git a/test/runtime/samples/onstate-before-render/main.html b/test/runtime/samples/lifecycle-render-order/main.html similarity index 88% rename from test/runtime/samples/onstate-before-render/main.html rename to test/runtime/samples/lifecycle-render-order/main.html index 5f24b95510..118fb053ff 100644 --- a/test/runtime/samples/onstate-before-render/main.html +++ b/test/runtime/samples/lifecycle-render-order/main.html @@ -17,7 +17,7 @@ }); onMount(() => { - order.push('oncreate'); + order.push('onMount'); }); diff --git a/test/runtime/samples/onstate-before-render/order.js b/test/runtime/samples/lifecycle-render-order/order.js similarity index 100% rename from test/runtime/samples/onstate-before-render/order.js rename to test/runtime/samples/lifecycle-render-order/order.js diff --git a/test/runtime/samples/observe-binding-ignores-unchanged/Nested.html b/test/runtime/samples/observe-binding-ignores-unchanged/Nested.html deleted file mode 100644 index d116d67878..0000000000 --- a/test/runtime/samples/observe-binding-ignores-unchanged/Nested.html +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/test/runtime/samples/observe-binding-ignores-unchanged/_config.js b/test/runtime/samples/observe-binding-ignores-unchanged/_config.js deleted file mode 100644 index 29f58b63a5..0000000000 --- a/test/runtime/samples/observe-binding-ignores-unchanged/_config.js +++ /dev/null @@ -1,34 +0,0 @@ -export default { - html: ` - -field1: 1
-field2: 2
- `, - - ssrHtml: ` - -field1: 1
-field2: 2
- `, - - test(assert, component, target, window) { - let triggered = false; - component.nested.on('state', ({ changed }) => { - if (changed.field2) triggered = true; - }); - - const input = target.querySelector('input'); - const event = new window.Event('input'); - - input.value = 3; - input.dispatchEvent(event); // will throw error if observer fires incorrectly - - assert.ok(!triggered); - - assert.htmlEqual(target.innerHTML, ` - -field1: 3
-field2: 2
- `); - } -}; \ No newline at end of file diff --git a/test/runtime/samples/observe-binding-ignores-unchanged/main.html b/test/runtime/samples/observe-binding-ignores-unchanged/main.html deleted file mode 100644 index dbe6fd6cba..0000000000 --- a/test/runtime/samples/observe-binding-ignores-unchanged/main.html +++ /dev/null @@ -1,14 +0,0 @@ - - -field1: {myObject.field1}
-field2: {myObject.field2}
\ No newline at end of file diff --git a/test/runtime/samples/observe-prevents-loop/_config.js b/test/runtime/samples/observe-prevents-loop/_config.js deleted file mode 100644 index 2ae54519e5..0000000000 --- a/test/runtime/samples/observe-prevents-loop/_config.js +++ /dev/null @@ -1,29 +0,0 @@ -export default { - props: { - thing: { a: 1 } - }, - - test(assert, component) { - const thing = component.thing; - - component.$on('state', ({ changed, current }) => { - if (changed.thing) { - const { thing } = current; - thing.b = thing.a * 2; - component.thing = thing; // triggers infinite loop, unless event handler breaks it - } - }); - - assert.deepEqual(thing, { - a: 1 - }); - - thing.a = 3; - component.thing = thing; - - assert.deepEqual(thing, { - a: 3, - b: 6 - }); - } -}; diff --git a/test/runtime/samples/observe-prevents-loop/main.html b/test/runtime/samples/observe-prevents-loop/main.html deleted file mode 100644 index 7c89b545c5..0000000000 --- a/test/runtime/samples/observe-prevents-loop/main.html +++ /dev/null @@ -1 +0,0 @@ - diff --git a/test/runtime/samples/oncreate-async-arrow-block/_config.js b/test/runtime/samples/oncreate-async-arrow-block/_config.js deleted file mode 100644 index a5ed4ad14f..0000000000 --- a/test/runtime/samples/oncreate-async-arrow-block/_config.js +++ /dev/null @@ -1,3 +0,0 @@ -export default { - skip: +(/^v(\d)/.exec(process.version)[1]) < 8 -}; diff --git a/test/runtime/samples/oncreate-async-arrow/_config.js b/test/runtime/samples/oncreate-async-arrow/_config.js deleted file mode 100644 index a5ed4ad14f..0000000000 --- a/test/runtime/samples/oncreate-async-arrow/_config.js +++ /dev/null @@ -1,3 +0,0 @@ -export default { - skip: +(/^v(\d)/.exec(process.version)[1]) < 8 -}; diff --git a/test/runtime/samples/oncreate-async-arrow/main.html b/test/runtime/samples/oncreate-async-arrow/main.html deleted file mode 100644 index 35ebde8ae2..0000000000 --- a/test/runtime/samples/oncreate-async-arrow/main.html +++ /dev/null @@ -1,5 +0,0 @@ - diff --git a/test/runtime/samples/oncreate-async/_config.js b/test/runtime/samples/oncreate-async/_config.js deleted file mode 100644 index a5ed4ad14f..0000000000 --- a/test/runtime/samples/oncreate-async/_config.js +++ /dev/null @@ -1,3 +0,0 @@ -export default { - skip: +(/^v(\d)/.exec(process.version)[1]) < 8 -}; diff --git a/test/runtime/samples/oncreate-async/main.html b/test/runtime/samples/oncreate-async/main.html deleted file mode 100644 index f75c6ccd4e..0000000000 --- a/test/runtime/samples/oncreate-async/main.html +++ /dev/null @@ -1,7 +0,0 @@ - diff --git a/test/runtime/samples/onmount-async/_config.js b/test/runtime/samples/onmount-async/_config.js new file mode 100644 index 0000000000..f1dcc36d41 --- /dev/null +++ b/test/runtime/samples/onmount-async/_config.js @@ -0,0 +1,3 @@ +export default { + skip: +(/^v(\d+)/.exec(process.version)[1]) < 8 +}; diff --git a/test/runtime/samples/oncreate-async-arrow-block/main.html b/test/runtime/samples/onmount-async/main.html similarity index 100% rename from test/runtime/samples/oncreate-async-arrow-block/main.html rename to test/runtime/samples/onmount-async/main.html diff --git a/test/runtime/samples/onrender-fires-when-ready-nested/ParentWidget.html b/test/runtime/samples/onmount-fires-when-ready-nested/ParentWidget.html similarity index 100% rename from test/runtime/samples/onrender-fires-when-ready-nested/ParentWidget.html rename to test/runtime/samples/onmount-fires-when-ready-nested/ParentWidget.html diff --git a/test/runtime/samples/onrender-fires-when-ready-nested/Widget.html b/test/runtime/samples/onmount-fires-when-ready-nested/Widget.html similarity index 100% rename from test/runtime/samples/onrender-fires-when-ready-nested/Widget.html rename to test/runtime/samples/onmount-fires-when-ready-nested/Widget.html diff --git a/test/runtime/samples/onrender-fires-when-ready-nested/_config.js b/test/runtime/samples/onmount-fires-when-ready-nested/_config.js similarity index 100% rename from test/runtime/samples/onrender-fires-when-ready-nested/_config.js rename to test/runtime/samples/onmount-fires-when-ready-nested/_config.js diff --git a/test/runtime/samples/onrender-fires-when-ready-nested/main.html b/test/runtime/samples/onmount-fires-when-ready-nested/main.html similarity index 100% rename from test/runtime/samples/onrender-fires-when-ready-nested/main.html rename to test/runtime/samples/onmount-fires-when-ready-nested/main.html diff --git a/test/runtime/samples/onrender-fires-when-ready/Widget.html b/test/runtime/samples/onmount-fires-when-ready/Widget.html similarity index 100% rename from test/runtime/samples/onrender-fires-when-ready/Widget.html rename to test/runtime/samples/onmount-fires-when-ready/Widget.html diff --git a/test/runtime/samples/onrender-fires-when-ready/_config.js b/test/runtime/samples/onmount-fires-when-ready/_config.js similarity index 100% rename from test/runtime/samples/onrender-fires-when-ready/_config.js rename to test/runtime/samples/onmount-fires-when-ready/_config.js diff --git a/test/runtime/samples/onrender-fires-when-ready/main.html b/test/runtime/samples/onmount-fires-when-ready/main.html similarity index 100% rename from test/runtime/samples/onrender-fires-when-ready/main.html rename to test/runtime/samples/onmount-fires-when-ready/main.html diff --git a/test/runtime/samples/oncreate-sibling-order/Nested.html b/test/runtime/samples/onmount-sibling-order/Nested.html similarity index 73% rename from test/runtime/samples/oncreate-sibling-order/Nested.html rename to test/runtime/samples/onmount-sibling-order/Nested.html index 6d93be98dc..da163387d9 100644 --- a/test/runtime/samples/oncreate-sibling-order/Nested.html +++ b/test/runtime/samples/onmount-sibling-order/Nested.html @@ -6,7 +6,7 @@ export let name; onMount(() => { - result.push(`oncreate ${name}`); + result.push(`onMount ${name}`); }); diff --git a/test/runtime/samples/oncreate-sibling-order/_config.js b/test/runtime/samples/onmount-sibling-order/_config.js similarity index 79% rename from test/runtime/samples/oncreate-sibling-order/_config.js rename to test/runtime/samples/onmount-sibling-order/_config.js index 4e28940b74..f6961637ac 100644 --- a/test/runtime/samples/oncreate-sibling-order/_config.js +++ b/test/runtime/samples/onmount-sibling-order/_config.js @@ -3,8 +3,8 @@ import result from './result.js'; export default { test(assert) { assert.deepEqual(result, [ - 'oncreate foo', - 'oncreate bar' + 'onMount foo', + 'onMount bar' ]); result.pop(); diff --git a/test/runtime/samples/oncreate-sibling-order/main.html b/test/runtime/samples/onmount-sibling-order/main.html similarity index 100% rename from test/runtime/samples/oncreate-sibling-order/main.html rename to test/runtime/samples/onmount-sibling-order/main.html diff --git a/test/runtime/samples/oncreate-sibling-order/result.js b/test/runtime/samples/onmount-sibling-order/result.js similarity index 100% rename from test/runtime/samples/oncreate-sibling-order/result.js rename to test/runtime/samples/onmount-sibling-order/result.js diff --git a/test/runtime/samples/onrender-chain/_config.js b/test/runtime/samples/onrender-chain/_config.js deleted file mode 100644 index 2938a184a1..0000000000 --- a/test/runtime/samples/onrender-chain/_config.js +++ /dev/null @@ -1,15 +0,0 @@ -export default { - 'skip-ssr': true, - - html: ` - 321 - `, - - test(assert, component, target) { - component.list.update(); - - assert.htmlEqual(target.innerHTML, ` - 12345 - `); - } -}; diff --git a/test/runtime/samples/onstate-before-oncreate/_config.js b/test/runtime/samples/onstate-before-oncreate/_config.js deleted file mode 100644 index ff2b87b712..0000000000 --- a/test/runtime/samples/onstate-before-oncreate/_config.js +++ /dev/null @@ -1,8 +0,0 @@ -export default { - 'skip-ssr': true, - - test(assert, component, target) { - assert.ok(component.onstateRanBeforeOncreate); - assert.ok(!component.onupdateRanBeforeOncreate); - } -}; diff --git a/test/runtime/samples/onstate-before-oncreate/main.html b/test/runtime/samples/onstate-before-oncreate/main.html deleted file mode 100644 index 2093a1220c..0000000000 --- a/test/runtime/samples/onstate-before-oncreate/main.html +++ /dev/null @@ -1,21 +0,0 @@ - \ No newline at end of file