diff --git a/test/runtime/samples/component-binding-blowback/_config.js b/test/runtime/samples/component-binding-blowback/_config.js index 87624c061c..a0a71e50de 100644 --- a/test/runtime/samples/component-binding-blowback/_config.js +++ b/test/runtime/samples/component-binding-blowback/_config.js @@ -2,7 +2,7 @@ export default { test(assert, component) { let count = 0; - component.on('state', ({ changed }) => { + component.$on('state', ({ changed }) => { if (changed.bar) count += 1; }); diff --git a/test/runtime/samples/component-event-not-stale/_config.js b/test/runtime/samples/component-event-not-stale/_config.js index 58e1c9b855..ca7a199406 100644 --- a/test/runtime/samples/component-event-not-stale/_config.js +++ b/test/runtime/samples/component-event-not-stale/_config.js @@ -8,8 +8,8 @@ export default { const click = new window.MouseEvent('click'); const events = []; - component.on('value', event => { - events.push(event); + component.$on('value', event => { + events.push(event.detail); }); buttons[0].dispatchEvent(click); diff --git a/test/runtime/samples/component-events-data/_config.js b/test/runtime/samples/component-events-data/_config.js index f3763be9b1..6949ac47a2 100644 --- a/test/runtime/samples/component-events-data/_config.js +++ b/test/runtime/samples/component-events-data/_config.js @@ -1,20 +1,20 @@ export default { - test ( assert, component, target, window ) { - const buttons = target.querySelectorAll( 'button' ); - const click = new window.MouseEvent( 'click' ); + test(assert, component, target, window) { + const buttons = target.querySelectorAll('button'); + const click = new window.MouseEvent('click'); const selected = []; - component.on( 'select', selection => { - selected.push( selection ); + component.$on('select', event => { + selected.push(event.detail); }); - buttons[1].dispatchEvent( click ); - buttons[2].dispatchEvent( click ); - buttons[1].dispatchEvent( click ); - buttons[0].dispatchEvent( click ); + buttons[1].dispatchEvent(click); + buttons[2].dispatchEvent(click); + buttons[1].dispatchEvent(click); + buttons[0].dispatchEvent(click); - assert.deepEqual( selected, [ + assert.deepEqual(selected, [ 'bar', 'baz', 'bar', diff --git a/test/runtime/samples/component-events-fire-finally/_config.js b/test/runtime/samples/component-events-fire-finally/_config.js index f768f5608b..95bdece12f 100644 --- a/test/runtime/samples/component-events-fire-finally/_config.js +++ b/test/runtime/samples/component-events-fire-finally/_config.js @@ -1,23 +1,32 @@ export default { - test(assert, component) { + test(assert, component, target, window) { + const buttons = target.querySelectorAll('button'); + const click = new window.MouseEvent('click'); + const events = []; - component.on('foo', (shouldThrow) => { + component.$on('foo', event => { + const shouldThrow = event.detail; + events.push(shouldThrow); if (shouldThrow) { throw new Error(); } }); - component.fire('foo', false); + + buttons[1].dispatchEvent(click); assert.equal(events.toString(), 'false'); + let threw = false; try { - component.fire('foo', true); + buttons[0].dispatchEvent(click); } catch (err) { threw = true; } + assert.equal(threw, true); assert.equal(events.toString(), 'false,true'); - component.fire('foo', false); + + buttons[1].dispatchEvent(click); assert.equal(events.toString(), 'false,true,false'); }, }; diff --git a/test/runtime/samples/component-events-fire-finally/main.html b/test/runtime/samples/component-events-fire-finally/main.html index 9f26b637f0..91f614b107 100644 --- a/test/runtime/samples/component-events-fire-finally/main.html +++ b/test/runtime/samples/component-events-fire-finally/main.html @@ -1 +1,8 @@ -Foo \ No newline at end of file + + + + \ No newline at end of file diff --git a/test/runtime/samples/component-events/_config.js b/test/runtime/samples/component-events/_config.js index 3b14213a94..b700ad0b5c 100644 --- a/test/runtime/samples/component-events/_config.js +++ b/test/runtime/samples/component-events/_config.js @@ -8,7 +8,7 @@ export default { test ( assert, component ) { let count = 0; - component.on( 'widgetTornDown', function () { + component.$on( 'widgetTornDown', function () { assert.equal( this, component ); count += 1; }); diff --git a/test/runtime/samples/destructuring/_config.js b/test/runtime/samples/destructuring/_config.js index e99693a856..a3bfd276c4 100644 --- a/test/runtime/samples/destructuring/_config.js +++ b/test/runtime/samples/destructuring/_config.js @@ -5,23 +5,21 @@ export default { foo: 42 }, - test ( assert, component, target, window ) { - const event = new window.MouseEvent( 'click' ); - const button = target.querySelector( 'button' ); + test(assert, component, target, window) { + const event = new window.MouseEvent('click'); + const button = target.querySelector('button'); let count = 0; let number = null; - component.on( 'foo', obj => { + component.$on('foo', event => { count++; - number = obj.foo; + number = event.detail.foo; }); - button.dispatchEvent( event ); + button.dispatchEvent(event); - assert.equal( count, 1 ); - assert.equal( number, 42 ); - - component.destroy(); + assert.equal(count, 1); + assert.equal(number, 42); } }; \ No newline at end of file diff --git a/test/runtime/samples/event-handler-each-this/_config.js b/test/runtime/samples/event-handler-each-this/_config.js index b559942a57..54ce26b3db 100644 --- a/test/runtime/samples/event-handler-each-this/_config.js +++ b/test/runtime/samples/event-handler-each-this/_config.js @@ -15,7 +15,7 @@ export default { const clicked = []; - component.on('clicked', event => { + component.$on('clicked', event => { clicked.push(event.node); }); diff --git a/test/runtime/samples/event-handler-shorthand-component/_config.js b/test/runtime/samples/event-handler-shorthand-component/_config.js index e0e21f1400..7f9f59983e 100644 --- a/test/runtime/samples/event-handler-shorthand-component/_config.js +++ b/test/runtime/samples/event-handler-shorthand-component/_config.js @@ -8,7 +8,7 @@ export default { const event = new window.MouseEvent('click'); let answer; - component.on('foo', event => { + component.$on('foo', event => { answer = event.answer; }); diff --git a/test/runtime/samples/event-handler-shorthand-dynamic-component/_config.js b/test/runtime/samples/event-handler-shorthand-dynamic-component/_config.js index e0e21f1400..7f9f59983e 100644 --- a/test/runtime/samples/event-handler-shorthand-dynamic-component/_config.js +++ b/test/runtime/samples/event-handler-shorthand-dynamic-component/_config.js @@ -8,7 +8,7 @@ export default { const event = new window.MouseEvent('click'); let answer; - component.on('foo', event => { + component.$on('foo', event => { answer = event.answer; }); diff --git a/test/runtime/samples/events-custom/_config.js b/test/runtime/samples/events-custom/_config.js index 9fe6bbb6c7..f867c39a5b 100644 --- a/test/runtime/samples/events-custom/_config.js +++ b/test/runtime/samples/events-custom/_config.js @@ -4,7 +4,7 @@ export default { const expected = { x: 1 }; - component.on( 'foo', data => { + component.$on( 'foo', data => { assert.equal( data, expected ); count += 1; }); diff --git a/test/runtime/samples/events-lifecycle/_config.js b/test/runtime/samples/events-lifecycle/_config.js deleted file mode 100644 index ddd6223840..0000000000 --- a/test/runtime/samples/events-lifecycle/_config.js +++ /dev/null @@ -1,13 +0,0 @@ -export default { - test ( assert, component ) { - let count = 0; - - component.on( 'destroy', function () { - assert.equal( this, component ); - count += 1; - }); - - component.destroy(); - assert.equal( count, 1 ); - } -}; diff --git a/test/runtime/samples/events-lifecycle/main.html b/test/runtime/samples/events-lifecycle/main.html deleted file mode 100644 index 7c89b545c5..0000000000 --- a/test/runtime/samples/events-lifecycle/main.html +++ /dev/null @@ -1 +0,0 @@ -
diff --git a/test/runtime/samples/immutable-root/_config.js b/test/runtime/samples/immutable-root/_config.js index 35a42859b6..2b99876930 100644 --- a/test/runtime/samples/immutable-root/_config.js +++ b/test/runtime/samples/immutable-root/_config.js @@ -3,7 +3,7 @@ export default { html: `

Called 0 times.

`, test(assert, component, target, window) { - component.on('state', ({ changed }) => { + component.$on('state', ({ changed }) => { if (changed.foo) { component.count = component.count + 1; } diff --git a/test/runtime/samples/observe-prevents-loop/_config.js b/test/runtime/samples/observe-prevents-loop/_config.js index 457010120b..2ae54519e5 100644 --- a/test/runtime/samples/observe-prevents-loop/_config.js +++ b/test/runtime/samples/observe-prevents-loop/_config.js @@ -6,7 +6,7 @@ export default { test(assert, component) { const thing = component.thing; - component.on('state', ({ changed, current }) => { + component.$on('state', ({ changed, current }) => { if (changed.thing) { const { thing } = current; thing.b = thing.a * 2; diff --git a/test/runtime/samples/onstate-event/_config.js b/test/runtime/samples/onstate-event/_config.js index 72f3dc7d25..7875c5402c 100644 --- a/test/runtime/samples/onstate-event/_config.js +++ b/test/runtime/samples/onstate-event/_config.js @@ -13,7 +13,7 @@ export default { test(assert, component, target) { const history = []; - component.on('state', ({ changed, current, previous }) => { + component.$on('state', ({ changed, current, previous }) => { history.push({ changed, current, previous }); component.bar = current.foo.toUpperCase(); }); diff --git a/test/runtime/samples/set-in-ondestroy/_config.js b/test/runtime/samples/set-in-ondestroy/_config.js index e67126b215..5e11c5466c 100644 --- a/test/runtime/samples/set-in-ondestroy/_config.js +++ b/test/runtime/samples/set-in-ondestroy/_config.js @@ -9,12 +9,12 @@ export default { const values = []; let valueOnDestroy; - component.on('destroy', () => { + component.$on('destroy', () => { component.foo = 2; valueOnDestroy = component.foo; }); - component.on('state', ({ current }) => { + component.$on('state', ({ current }) => { values.push(current.foo); }); diff --git a/test/runtime/samples/transition-js-events/_config.js b/test/runtime/samples/transition-js-events/_config.js index 50b5cfdd7c..e5f52e1421 100644 --- a/test/runtime/samples/transition-js-events/_config.js +++ b/test/runtime/samples/transition-js-events/_config.js @@ -22,7 +22,7 @@ export default { assert.equal(component.outroCount, 0); component.visible = true; - component.on('intro.start', () => { + component.$on('intro.start', () => { throw new Error(`intro.start should fire during set(), not after`); });