From 15f22ca7458601bd1d6f7ab0a252aaaa921be73b Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Mon, 19 Nov 2018 21:08:59 -0500 Subject: [PATCH] fix a few tests --- src/compile/nodes/Window.ts | 6 +++--- src/compile/render-dom/wrappers/Document.ts | 2 +- .../binding-select-in-yield/Modal.html | 2 +- .../bindings-before-oncreate/main.html | 2 ++ .../samples/bindings-coalesced/main.html | 1 + test/runtime/samples/custom-method/_config.js | 21 ++++++++++--------- .../samples/deconflict-non-helpers/_config.js | 2 +- .../samples/deconflict-non-helpers/main.html | 2 +- .../Bar.html | 1 - .../Foo.html | 1 - .../_config.js | 16 -------------- .../main.html | 10 --------- 12 files changed, 21 insertions(+), 45 deletions(-) delete mode 100644 test/runtime/samples/dev-warning-dynamic-components-misplaced/Bar.html delete mode 100644 test/runtime/samples/dev-warning-dynamic-components-misplaced/Foo.html delete mode 100644 test/runtime/samples/dev-warning-dynamic-components-misplaced/_config.js delete mode 100644 test/runtime/samples/dev-warning-dynamic-components-misplaced/main.html diff --git a/src/compile/nodes/Window.ts b/src/compile/nodes/Window.ts index 5d41db1d7f..4545ee2fca 100644 --- a/src/compile/nodes/Window.ts +++ b/src/compile/nodes/Window.ts @@ -32,10 +32,10 @@ export default class Window extends Node { } else if (node.type === 'Binding') { - if (node.value.type !== 'Identifier') { - const { parts } = flattenReference(node.value); + if (node.expression.type !== 'Identifier') { + const { parts } = flattenReference(node.expression); - component.error(node.value, { + component.error(node.expression, { code: `invalid-binding`, message: `Bindings on must be to top-level properties, e.g. '${parts[parts.length - 1]}' rather than '${parts.join('.')}'` }); diff --git a/src/compile/render-dom/wrappers/Document.ts b/src/compile/render-dom/wrappers/Document.ts index b13ec808ce..81c8d7ac94 100644 --- a/src/compile/render-dom/wrappers/Document.ts +++ b/src/compile/render-dom/wrappers/Document.ts @@ -22,7 +22,7 @@ export default class DocumentWrapper extends Wrapper { const isCustomEvent = false; // TODO!!! - let usesState = handler.dependencies.size > 0; + let usesState = handler.expression.dependencies.size > 0; handler.render(component, block, 'document', false); // TODO hoist? diff --git a/test/runtime/samples/binding-select-in-yield/Modal.html b/test/runtime/samples/binding-select-in-yield/Modal.html index 60a4d0b994..b106e7b1d7 100644 --- a/test/runtime/samples/binding-select-in-yield/Modal.html +++ b/test/runtime/samples/binding-select-in-yield/Modal.html @@ -2,7 +2,7 @@ export let hidden = true; export function toggle() { - hidden = !this.get().hidden; + hidden = !hidden; } diff --git a/test/runtime/samples/bindings-before-oncreate/main.html b/test/runtime/samples/bindings-before-oncreate/main.html index 6d40cec2dc..6bb20cc3fe 100644 --- a/test/runtime/samples/bindings-before-oncreate/main.html +++ b/test/runtime/samples/bindings-before-oncreate/main.html @@ -1,5 +1,7 @@ \ No newline at end of file diff --git a/test/runtime/samples/bindings-coalesced/main.html b/test/runtime/samples/bindings-coalesced/main.html index 53263ed968..8b82af9e67 100644 --- a/test/runtime/samples/bindings-coalesced/main.html +++ b/test/runtime/samples/bindings-coalesced/main.html @@ -1,6 +1,7 @@ diff --git a/test/runtime/samples/custom-method/_config.js b/test/runtime/samples/custom-method/_config.js index 53d447c50a..ea852cebb3 100644 --- a/test/runtime/samples/custom-method/_config.js +++ b/test/runtime/samples/custom-method/_config.js @@ -1,17 +1,18 @@ export default { html: '\n\n

0

', - test ( assert, component, target, window ) { - const button = target.querySelector( 'button' ); - const event = new window.MouseEvent( 'click' ); - button.dispatchEvent( event ); - assert.equal( component.counter, 1 ); - assert.equal( target.innerHTML, '\n\n

1

' ); + async test(assert, component, target, window) { + const button = target.querySelector('button'); + const event = new window.MouseEvent('click'); - button.dispatchEvent( event ); - assert.equal( component.counter, 2 ); - assert.equal( target.innerHTML, '\n\n

2

' ); + await button.dispatchEvent(event); + assert.equal(component.counter, 1); + assert.equal(target.innerHTML, '\n\n

1

'); - assert.equal( component.foo(), 42 ); + await button.dispatchEvent(event); + assert.equal(component.counter, 2); + assert.equal(target.innerHTML, '\n\n

2

'); + + assert.equal(component.foo(), 42); } }; diff --git a/test/runtime/samples/deconflict-non-helpers/_config.js b/test/runtime/samples/deconflict-non-helpers/_config.js index aac32e09f7..a642d3b6d4 100644 --- a/test/runtime/samples/deconflict-non-helpers/_config.js +++ b/test/runtime/samples/deconflict-non-helpers/_config.js @@ -2,6 +2,6 @@ export default { html: `ABCD`, test (assert, component) { - assert.equal(component.compute, 'ABCD'); + assert.equal(component.compute(), 'ABCD'); } }; diff --git a/test/runtime/samples/deconflict-non-helpers/main.html b/test/runtime/samples/deconflict-non-helpers/main.html index a034fd58fb..02cab9d7e6 100644 --- a/test/runtime/samples/deconflict-non-helpers/main.html +++ b/test/runtime/samples/deconflict-non-helpers/main.html @@ -3,7 +3,7 @@ export let value = addCss + addedCss + applyComputations + renderMainFragment; - function compute() { + export function compute() { return value.toUpperCase(); } diff --git a/test/runtime/samples/dev-warning-dynamic-components-misplaced/Bar.html b/test/runtime/samples/dev-warning-dynamic-components-misplaced/Bar.html deleted file mode 100644 index d9d3a9a899..0000000000 --- a/test/runtime/samples/dev-warning-dynamic-components-misplaced/Bar.html +++ /dev/null @@ -1 +0,0 @@ -Bar \ No newline at end of file diff --git a/test/runtime/samples/dev-warning-dynamic-components-misplaced/Foo.html b/test/runtime/samples/dev-warning-dynamic-components-misplaced/Foo.html deleted file mode 100644 index 9f26b637f0..0000000000 --- a/test/runtime/samples/dev-warning-dynamic-components-misplaced/Foo.html +++ /dev/null @@ -1 +0,0 @@ -Foo \ No newline at end of file diff --git a/test/runtime/samples/dev-warning-dynamic-components-misplaced/_config.js b/test/runtime/samples/dev-warning-dynamic-components-misplaced/_config.js deleted file mode 100644 index 863d7a6be1..0000000000 --- a/test/runtime/samples/dev-warning-dynamic-components-misplaced/_config.js +++ /dev/null @@ -1,16 +0,0 @@ -export default { - compileOptions: { - dev: true - }, - - props: { - x: true - }, - - html: '', - - warnings: [ - ` expected to find 'Foo' in \`data\`, but found it in \`components\` instead`, - ` expected to find 'Bar' in \`data\`, but found it in \`components\` instead` - ] -}; \ No newline at end of file diff --git a/test/runtime/samples/dev-warning-dynamic-components-misplaced/main.html b/test/runtime/samples/dev-warning-dynamic-components-misplaced/main.html deleted file mode 100644 index 4bf3b848c4..0000000000 --- a/test/runtime/samples/dev-warning-dynamic-components-misplaced/main.html +++ /dev/null @@ -1,10 +0,0 @@ - - - \ No newline at end of file