From: Evan You Date: Wed, 5 Feb 2020 19:30:34 +0000 (-0500) Subject: test: fix tests w/ nested CompoundExpressions X-Git-Tag: v3.0.0-alpha.5~104 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8f9e85afb173d3d98f28a9958ec1047fa5d07eda;p=thirdparty%2Fvuejs%2Fcore.git test: fix tests w/ nested CompoundExpressions --- diff --git a/packages/compiler-core/__tests__/__snapshots__/codegen.spec.ts.snap b/packages/compiler-core/__tests__/__snapshots__/codegen.spec.ts.snap index 4a577b76f3..111b752490 100644 --- a/packages/compiler-core/__tests__/__snapshots__/codegen.spec.ts.snap +++ b/packages/compiler-core/__tests__/__snapshots__/codegen.spec.ts.snap @@ -99,7 +99,7 @@ exports[`compiler: codegen compound expression 1`] = ` " return function render() { with (this) { - return _ctx.foo + _toDisplayString(bar) + return _ctx.foo + _toDisplayString(bar) + nested } }" `; diff --git a/packages/compiler-core/__tests__/codegen.spec.ts b/packages/compiler-core/__tests__/codegen.spec.ts index b360384b6a..b403479368 100644 --- a/packages/compiler-core/__tests__/codegen.spec.ts +++ b/packages/compiler-core/__tests__/codegen.spec.ts @@ -207,12 +207,14 @@ describe('compiler: codegen', () => { type: NodeTypes.INTERPOLATION, loc: locStub, content: createSimpleExpression(`bar`, false, locStub) - } + }, + // nested compound + createCompoundExpression([` + `, `nested`]) ]) }) ) expect(code).toMatch( - `return _ctx.foo + _${helperNameMap[TO_DISPLAY_STRING]}(bar)` + `return _ctx.foo + _${helperNameMap[TO_DISPLAY_STRING]}(bar) + nested` ) expect(code).toMatchSnapshot() }) diff --git a/packages/compiler-core/__tests__/transforms/vModel.spec.ts b/packages/compiler-core/__tests__/transforms/vModel.spec.ts index 5f2721f8d8..37812852fa 100644 --- a/packages/compiler-core/__tests__/transforms/vModel.spec.ts +++ b/packages/compiler-core/__tests__/transforms/vModel.spec.ts @@ -191,15 +191,19 @@ describe('compiler: transform v-model', () => { children: [ '$event => (', { - content: '_ctx.model', - isStatic: false - }, - '[', - { - content: '_ctx.index', - isStatic: false + children: [ + { + content: '_ctx.model', + isStatic: false + }, + '[', + { + content: '_ctx.index', + isStatic: false + }, + ']' + ] }, - ']', ' = $event)' ] } diff --git a/packages/compiler-core/__tests__/transforms/vOn.spec.ts b/packages/compiler-core/__tests__/transforms/vOn.spec.ts index 596d7352d0..3ba3c4a818 100644 --- a/packages/compiler-core/__tests__/transforms/vOn.spec.ts +++ b/packages/compiler-core/__tests__/transforms/vOn.spec.ts @@ -168,11 +168,16 @@ describe('compiler: transform v-on', () => { type: NodeTypes.COMPOUND_EXPRESSION, children: [ `$event => (`, - { content: `_ctx.foo` }, - `(`, - // should NOT prefix $event - { content: `$event` }, - `)`, + { + type: NodeTypes.COMPOUND_EXPRESSION, + children: [ + { content: `_ctx.foo` }, + `(`, + // should NOT prefix $event + { content: `$event` }, + `)` + ] + }, `)` ] } @@ -191,13 +196,17 @@ describe('compiler: transform v-on', () => { type: NodeTypes.COMPOUND_EXPRESSION, children: [ `$event => {`, - { content: `_ctx.foo` }, - `(`, - // should NOT prefix $event - { content: `$event` }, - `);`, - { content: `_ctx.bar` }, - `()`, + { + children: [ + { content: `_ctx.foo` }, + `(`, + // should NOT prefix $event + { content: `$event` }, + `);`, + { content: `_ctx.bar` }, + `()` + ] + }, `}` ] } @@ -363,7 +372,11 @@ describe('compiler: transform v-on', () => { index: 1, value: { type: NodeTypes.COMPOUND_EXPRESSION, - children: [`$event => (`, { content: `_ctx.foo` }, `++`, `)`] + children: [ + `$event => (`, + { children: [{ content: `_ctx.foo` }, `++`] }, + `)` + ] } }) })