diff --git a/test/runtime/samples/action-custom-event-handler-node-context/_config.js b/test/runtime/samples/action-custom-event-handler-node-context/_config.js index 1df95c590a..4b2e6e9317 100644 --- a/test/runtime/samples/action-custom-event-handler-node-context/_config.js +++ b/test/runtime/samples/action-custom-event-handler-node-context/_config.js @@ -1,5 +1,5 @@ export default { - 'skip-ssr': true, + skip_if_ssr: true, html: '', diff --git a/test/runtime/samples/after-render-prevents-loop/_config.js b/test/runtime/samples/after-render-prevents-loop/_config.js index 9a4ad53767..32820279ca 100644 --- a/test/runtime/samples/after-render-prevents-loop/_config.js +++ b/test/runtime/samples/after-render-prevents-loop/_config.js @@ -1,5 +1,5 @@ export default { - 'skip-ssr': true, + skip_if_ssr: true, props: { value: 'hello!' diff --git a/test/runtime/samples/after-render-triggers-update/_config.js b/test/runtime/samples/after-render-triggers-update/_config.js index 9a4ad53767..32820279ca 100644 --- a/test/runtime/samples/after-render-triggers-update/_config.js +++ b/test/runtime/samples/after-render-triggers-update/_config.js @@ -1,5 +1,5 @@ export default { - 'skip-ssr': true, + skip_if_ssr: true, props: { value: 'hello!' diff --git a/test/runtime/samples/attribute-boolean-indeterminate/_config.js b/test/runtime/samples/attribute-boolean-indeterminate/_config.js index f30b577a5a..de3e997fd1 100644 --- a/test/runtime/samples/attribute-boolean-indeterminate/_config.js +++ b/test/runtime/samples/attribute-boolean-indeterminate/_config.js @@ -1,7 +1,7 @@ export default { // This is a bit of a funny one — there's no equivalent attribute, // so it can't be server-rendered - 'skip-ssr': true, + skip_if_ssr: true, props: { indeterminate: true diff --git a/test/runtime/samples/attribute-dynamic-type/_config.js b/test/runtime/samples/attribute-dynamic-type/_config.js index 4dcb4595c2..b2e1e3b360 100644 --- a/test/runtime/samples/attribute-dynamic-type/_config.js +++ b/test/runtime/samples/attribute-dynamic-type/_config.js @@ -1,5 +1,5 @@ export default { - 'skip-ssr': true, + skip_if_ssr: true, props: { inputType: 'text', diff --git a/test/runtime/samples/attribute-prefer-expression/_config.js b/test/runtime/samples/attribute-prefer-expression/_config.js index e9f60dbc24..2c37dc9ded 100644 --- a/test/runtime/samples/attribute-prefer-expression/_config.js +++ b/test/runtime/samples/attribute-prefer-expression/_config.js @@ -1,5 +1,5 @@ export default { - 'skip-ssr': true, + skip_if_ssr: true, props: { foo: false, diff --git a/test/runtime/samples/before-render-chain/_config.js b/test/runtime/samples/before-render-chain/_config.js index 3e3f27bd8c..ea6b285803 100644 --- a/test/runtime/samples/before-render-chain/_config.js +++ b/test/runtime/samples/before-render-chain/_config.js @@ -1,5 +1,5 @@ export default { - 'skip-ssr': true, + skip_if_ssr: true, html: ` 3 diff --git a/test/runtime/samples/before-render-prevents-loop/_config.js b/test/runtime/samples/before-render-prevents-loop/_config.js index 9a4ad53767..32820279ca 100644 --- a/test/runtime/samples/before-render-prevents-loop/_config.js +++ b/test/runtime/samples/before-render-prevents-loop/_config.js @@ -1,5 +1,5 @@ export default { - 'skip-ssr': true, + skip_if_ssr: true, props: { value: 'hello!' diff --git a/test/runtime/samples/binding-indirect/_config.js b/test/runtime/samples/binding-indirect/_config.js index 7419d5b10d..cdc9f23552 100644 --- a/test/runtime/samples/binding-indirect/_config.js +++ b/test/runtime/samples/binding-indirect/_config.js @@ -6,7 +6,7 @@ const tasks = [ ]; export default { - 'skip-ssr': true, + skip_if_ssr: true, props: { tasks, diff --git a/test/runtime/samples/binding-input-checkbox-indeterminate/_config.js b/test/runtime/samples/binding-input-checkbox-indeterminate/_config.js index cf50585fd9..28c65b0fda 100644 --- a/test/runtime/samples/binding-input-checkbox-indeterminate/_config.js +++ b/test/runtime/samples/binding-input-checkbox-indeterminate/_config.js @@ -1,5 +1,5 @@ export default { - 'skip-ssr': true, + skip_if_ssr: true, props: { indeterminate: true, diff --git a/test/runtime/samples/binding-select-initial-value-undefined/_config.js b/test/runtime/samples/binding-select-initial-value-undefined/_config.js index aaa2b2f382..2cd091aa21 100644 --- a/test/runtime/samples/binding-select-initial-value-undefined/_config.js +++ b/test/runtime/samples/binding-select-initial-value-undefined/_config.js @@ -1,5 +1,5 @@ export default { - 'skip-ssr': true, // TODO would be nice to fix this in SSR as well + skip_if_ssr: true, // TODO would be nice to fix this in SSR as well html: `

selected: a

diff --git a/test/runtime/samples/component-binding-blowback-b/_config.js b/test/runtime/samples/component-binding-blowback-b/_config.js index 3d32e93fd4..13d9c983c9 100644 --- a/test/runtime/samples/component-binding-blowback-b/_config.js +++ b/test/runtime/samples/component-binding-blowback-b/_config.js @@ -1,5 +1,5 @@ export default { - 'skip-ssr': true, + skip_if_ssr: true, props: { count: 3 diff --git a/test/runtime/samples/component-binding-blowback-c/_config.js b/test/runtime/samples/component-binding-blowback-c/_config.js index 115f8286f4..d08b15c7ac 100644 --- a/test/runtime/samples/component-binding-blowback-c/_config.js +++ b/test/runtime/samples/component-binding-blowback-c/_config.js @@ -1,5 +1,5 @@ export default { - 'skip-ssr': true, + skip_if_ssr: true, props: { count: 3 diff --git a/test/runtime/samples/component-binding-conditional-b/_config.js b/test/runtime/samples/component-binding-conditional-b/_config.js index d0579b9c9a..cd90b9bd0d 100644 --- a/test/runtime/samples/component-binding-conditional-b/_config.js +++ b/test/runtime/samples/component-binding-conditional-b/_config.js @@ -1,5 +1,5 @@ export default { - 'skip-ssr': true, // TODO delete this line, once binding works + skip_if_ssr: true, // TODO delete this line, once binding works // This test fails, because the Bar y binding is activated before the // Baz x binding, meaning that by the time Foo is created, we already diff --git a/test/runtime/samples/component-binding-conditional/_config.js b/test/runtime/samples/component-binding-conditional/_config.js index a0c11c3c98..c2cc7b9f1e 100644 --- a/test/runtime/samples/component-binding-conditional/_config.js +++ b/test/runtime/samples/component-binding-conditional/_config.js @@ -1,5 +1,5 @@ export default { - 'skip-ssr': true, // TODO delete this line, once binding works + skip_if_ssr: true, // TODO delete this line, once binding works html: `

y: bar

diff --git a/test/runtime/samples/component-binding-nested/_config.js b/test/runtime/samples/component-binding-nested/_config.js index c72e7ac1ee..c2056266d0 100644 --- a/test/runtime/samples/component-binding-nested/_config.js +++ b/test/runtime/samples/component-binding-nested/_config.js @@ -1,5 +1,5 @@ export default { - 'skip-ssr': true, // TODO delete this line, once binding works + skip_if_ssr: true, // TODO delete this line, once binding works props: { x: 'initial' diff --git a/test/runtime/samples/component-binding/_config.js b/test/runtime/samples/component-binding/_config.js index d16976e8bc..a220192081 100644 --- a/test/runtime/samples/component-binding/_config.js +++ b/test/runtime/samples/component-binding/_config.js @@ -1,5 +1,5 @@ export default { - 'skip-ssr': true, // TODO delete this line, once binding works + skip_if_ssr: true, // TODO delete this line, once binding works html: ` diff --git a/test/runtime/samples/flush-before-bindings/_config.js b/test/runtime/samples/flush-before-bindings/_config.js index 8835772fc4..620b5d1455 100644 --- a/test/runtime/samples/flush-before-bindings/_config.js +++ b/test/runtime/samples/flush-before-bindings/_config.js @@ -3,7 +3,7 @@ export default { skip: true, // TODO - 'skip-ssr': true, + skip_if_ssr: true, html: `

first thing (true)

diff --git a/test/runtime/samples/lifecycle-render-order/_config.js b/test/runtime/samples/lifecycle-render-order/_config.js index f83f1f1c80..e2cee9046e 100644 --- a/test/runtime/samples/lifecycle-render-order/_config.js +++ b/test/runtime/samples/lifecycle-render-order/_config.js @@ -1,7 +1,7 @@ import order from './order.js'; export default { - 'skip-ssr': true, + skip_if_ssr: true, test(assert, component, target) { assert.deepEqual(order, [ diff --git a/test/runtime/samples/noscript-removal/_config.js b/test/runtime/samples/noscript-removal/_config.js index d935af9493..35bdcefd96 100644 --- a/test/runtime/samples/noscript-removal/_config.js +++ b/test/runtime/samples/noscript-removal/_config.js @@ -1,5 +1,5 @@ export default { - 'skip-ssr': true, + skip_if_ssr: true, html: `
foo
diff --git a/test/runtime/samples/onmount-fires-when-ready-nested/_config.js b/test/runtime/samples/onmount-fires-when-ready-nested/_config.js index f16d3ddeb9..b7446c1d72 100644 --- a/test/runtime/samples/onmount-fires-when-ready-nested/_config.js +++ b/test/runtime/samples/onmount-fires-when-ready-nested/_config.js @@ -1,5 +1,5 @@ export default { - 'skip-ssr': true, // uses oncreate + skip_if_ssr: true, // uses oncreate html: `

true

\n

true

` }; diff --git a/test/runtime/samples/onmount-fires-when-ready/_config.js b/test/runtime/samples/onmount-fires-when-ready/_config.js index f7ac0d740d..17e578f2f4 100644 --- a/test/runtime/samples/onmount-fires-when-ready/_config.js +++ b/test/runtime/samples/onmount-fires-when-ready/_config.js @@ -1,5 +1,5 @@ export default { - 'skip-ssr': true, // uses oncreate + skip_if_ssr: true, // uses oncreate html: `

true

`, diff --git a/test/runtime/samples/options/_config.js b/test/runtime/samples/options/_config.js index 6f321d7a6f..0a14704a21 100644 --- a/test/runtime/samples/options/_config.js +++ b/test/runtime/samples/options/_config.js @@ -1,5 +1,5 @@ export default { - 'skip-ssr': true, + skip_if_ssr: true, html: `

from this.options

`, options: { diff --git a/test/runtime/samples/raw-mustaches-preserved/_config.js b/test/runtime/samples/raw-mustaches-preserved/_config.js index 11e725e12b..6e8a559e05 100644 --- a/test/runtime/samples/raw-mustaches-preserved/_config.js +++ b/test/runtime/samples/raw-mustaches-preserved/_config.js @@ -1,5 +1,5 @@ export default { - 'skip-ssr': true, + skip_if_ssr: true, props: { raw: '

does not change

' diff --git a/test/runtime/samples/raw-mustaches/_config.js b/test/runtime/samples/raw-mustaches/_config.js index 982259bbf1..3ba28ab645 100644 --- a/test/runtime/samples/raw-mustaches/_config.js +++ b/test/runtime/samples/raw-mustaches/_config.js @@ -1,7 +1,7 @@ const ns = ''; export default { - 'skip-ssr': true, + skip_if_ssr: true, props: { raw: 'raw html!!!\\o/' diff --git a/test/runtime/samples/select-bind-array/_config.js b/test/runtime/samples/select-bind-array/_config.js index 79cece1704..a1bbb50ee2 100644 --- a/test/runtime/samples/select-bind-array/_config.js +++ b/test/runtime/samples/select-bind-array/_config.js @@ -1,7 +1,7 @@ const items = [ { id: 'a' }, { id: 'b' } ]; export default { - 'skip-ssr': true, + skip_if_ssr: true, props: { foo: 'b', diff --git a/test/runtime/samples/select-bind-in-array/_config.js b/test/runtime/samples/select-bind-in-array/_config.js index 6e4c21ca05..3575a45adb 100644 --- a/test/runtime/samples/select-bind-in-array/_config.js +++ b/test/runtime/samples/select-bind-in-array/_config.js @@ -1,7 +1,7 @@ const items = [ { id: 'a' }, { id: 'b' } ]; export default { - 'skip-ssr': true, + skip_if_ssr: true, props: { items diff --git a/test/runtime/samples/select-one-way-bind-object/_config.js b/test/runtime/samples/select-one-way-bind-object/_config.js index 1baefb4dcd..da71201f84 100644 --- a/test/runtime/samples/select-one-way-bind-object/_config.js +++ b/test/runtime/samples/select-one-way-bind-object/_config.js @@ -1,7 +1,7 @@ const items = [ {}, {} ]; export default { - 'skip-ssr': true, + skip_if_ssr: true, props: { foo: items[0], diff --git a/test/runtime/samples/select-one-way-bind/_config.js b/test/runtime/samples/select-one-way-bind/_config.js index b9d46dd6ba..d551e9a851 100644 --- a/test/runtime/samples/select-one-way-bind/_config.js +++ b/test/runtime/samples/select-one-way-bind/_config.js @@ -1,5 +1,5 @@ export default { - 'skip-ssr': true, + skip_if_ssr: true, props: { foo: 'a' diff --git a/test/runtime/samples/set-in-oncreate/_config.js b/test/runtime/samples/set-in-oncreate/_config.js index 307b5cb860..6f54649e14 100644 --- a/test/runtime/samples/set-in-oncreate/_config.js +++ b/test/runtime/samples/set-in-oncreate/_config.js @@ -1,5 +1,5 @@ export default { - 'skip-ssr': true, // uses oncreate + skip_if_ssr: true, // uses oncreate html: '

2

' }; diff --git a/test/runtime/samples/set-in-onstate/_config.js b/test/runtime/samples/set-in-onstate/_config.js index 7990401090..3fc9b8e950 100644 --- a/test/runtime/samples/set-in-onstate/_config.js +++ b/test/runtime/samples/set-in-onstate/_config.js @@ -1,5 +1,5 @@ export default { - 'skip-ssr': true, // uses oncreate + skip_if_ssr: true, // uses oncreate html: `

1

diff --git a/test/runtime/samples/svg-xmlns/_config.js b/test/runtime/samples/svg-xmlns/_config.js index a2395a9986..cbf1b388a0 100644 --- a/test/runtime/samples/svg-xmlns/_config.js +++ b/test/runtime/samples/svg-xmlns/_config.js @@ -1,5 +1,5 @@ export default { - 'skip-ssr': true, + skip_if_ssr: true, props: { x: 0, diff --git a/test/runtime/samples/textarea-children/_config.js b/test/runtime/samples/textarea-children/_config.js index b287c8c020..d5042e06b1 100644 --- a/test/runtime/samples/textarea-children/_config.js +++ b/test/runtime/samples/textarea-children/_config.js @@ -1,5 +1,5 @@ export default { - 'skip-ssr': true, // SSR behaviour is awkwardly different + skip_if_ssr: true, // SSR behaviour is awkwardly different props: { foo: 42 diff --git a/test/runtime/samples/textarea-value/_config.js b/test/runtime/samples/textarea-value/_config.js index 7a92f531b4..e0b8201561 100644 --- a/test/runtime/samples/textarea-value/_config.js +++ b/test/runtime/samples/textarea-value/_config.js @@ -1,5 +1,5 @@ export default { - 'skip-ssr': true, // SSR behaviour is awkwardly different + skip_if_ssr: true, // SSR behaviour is awkwardly different props: { foo: 42 diff --git a/test/runtime/samples/transition-js-nested-each-delete/_config.js b/test/runtime/samples/transition-js-nested-each-delete/_config.js index 7910eec74c..2d6a594605 100644 --- a/test/runtime/samples/transition-js-nested-each-delete/_config.js +++ b/test/runtime/samples/transition-js-nested-each-delete/_config.js @@ -1,26 +1,26 @@ export default { props: { visible: true, - things: [ 'a', 'b', 'c' ] + things: ['a', 'b', 'c'] }, - test ( assert, component, target, window, raf ) { + test(assert, component, target, window, raf) { assert.htmlEqual(target.innerHTML, `
a
b
c
`); - component.things = [ 'a' ]; + component.things = ['a']; - raf.tick( 100 ); + raf.tick(100); assert.htmlEqual(target.innerHTML, `
a
`); component.visible = false; - raf.tick( 200 ); + raf.tick(200); assert.htmlEqual(target.innerHTML, ''); } }; diff --git a/test/runtime/samples/window-binding-resize/_config.js b/test/runtime/samples/window-binding-resize/_config.js index bba2be71eb..473b06c358 100644 --- a/test/runtime/samples/window-binding-resize/_config.js +++ b/test/runtime/samples/window-binding-resize/_config.js @@ -3,7 +3,7 @@ export default { skip: true, // some weird stuff happening with JSDOM 11 // skip: /^v4/.test(process.version), // node 4 apparently does some dumb stuff - 'skip-ssr': true, // there's some kind of weird bug with this test... it compiles with the wrong require.extensions hook for some bizarre reason + skip_if_ssr: true, // there's some kind of weird bug with this test... it compiles with the wrong require.extensions hook for some bizarre reason async test(assert, component, target, window) { const event = new window.Event('resize'); diff --git a/test/runtime/samples/window-event-context/_config.js b/test/runtime/samples/window-event-context/_config.js index ee7f3f3793..134ab42306 100644 --- a/test/runtime/samples/window-event-context/_config.js +++ b/test/runtime/samples/window-event-context/_config.js @@ -6,7 +6,7 @@ export default { html: `true`, skip: /^v4/.test(process.version), // node 4 apparently does some dumb stuff - 'skip-ssr': true, // there's some kind of weird bug with this test... it compiles with the wrong require.extensions hook for some bizarre reason + skip_if_ssr: true, // there's some kind of weird bug with this test... it compiles with the wrong require.extensions hook for some bizarre reason async test(assert, component, target, window) { const event = new window.Event('click'); diff --git a/test/runtime/samples/window-event/_config.js b/test/runtime/samples/window-event/_config.js index 797e1bab8f..115719cbe7 100644 --- a/test/runtime/samples/window-event/_config.js +++ b/test/runtime/samples/window-event/_config.js @@ -3,7 +3,7 @@ export default { skip: true, // some weird stuff happening with JSDOM 11 // skip: /^v4/.test(process.version), // node 4 apparently does some dumb stuff - 'skip-ssr': true, // there's some kind of weird bug with this test... it compiles with the wrong require.extensions hook for some bizarre reason + skip_if_ssr: true, // there's some kind of weird bug with this test... it compiles with the wrong require.extensions hook for some bizarre reason async test(assert, component, target, window) { const event = new window.Event('resize'); diff --git a/test/server-side-rendering/index.js b/test/server-side-rendering/index.js index 5cd51488c1..5a0a0d6b12 100644 --- a/test/server-side-rendering/index.js +++ b/test/server-side-rendering/index.js @@ -100,7 +100,7 @@ describe("ssr", () => { throw new Error("Forgot to remove `solo: true` from test"); } - if (config["skip-ssr"]) return; + if (config.skip_if_ssr) return; (config.skip ? it.skip : config.solo ? it.only : it)(dir, () => { const cwd = path.resolve("test/runtime/samples", dir);