update some event tests

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;
 		});
 

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);

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',

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');
 	},
 };

test/runtime/samples/component-events-fire-finally/main.html

@@ -1 +1,8 @@
-Foo
+<script>
+	import { createEventDispatcher } from 'svelte';
+
+	const dispatch = createEventDispatcher();
+</script>
+
+<button on:click="{() => dispatch('foo', true)}">throw</button>
+<button on:click="{() => dispatch('foo', false)}">don't throw</button>

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;
 		});

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);
 	}
 };

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);
 		});
 

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;
 		});
 

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;
 		});
 

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;
 		});

test/runtime/samples/events-lifecycle/_config.js

@@ -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 );
-	}
-};

test/runtime/samples/events-lifecycle/main.html

@@ -1 +0,0 @@
-<div></div>

test/runtime/samples/immutable-root/_config.js

@@ -3,7 +3,7 @@ export default {
 	html: `<div><h3>Called 0 times.</h3></div>`,
 
 	test(assert, component, target, window) {
-		component.on('state', ({ changed }) => {
+		component.$on('state', ({ changed }) => {
 			if (changed.foo) {
 				component.count = component.count + 1;
 			}

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;

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();
 		});

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);
 		});
 

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`);
 		});