From: Evan You Date: Thu, 25 Mar 2021 20:06:02 +0000 (-0400) Subject: chore: fix test X-Git-Tag: v3.0.8~28 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7cf143dd4f5529fd108e6433745bfbe6029e7e83;p=thirdparty%2Fvuejs%2Fcore.git chore: fix test --- diff --git a/packages/runtime-core/src/component.ts b/packages/runtime-core/src/component.ts index 48f6f6e5ec..79847225bd 100644 --- a/packages/runtime-core/src/component.ts +++ b/packages/runtime-core/src/component.ts @@ -673,7 +673,8 @@ function finishComponentSetup( // 1. the render function may already exist, returned by `setup` // 2. otherwise try to use the `Component.render` // 3. if the component doesn't have a render function, - // set `instance.render` to NOOP so that it can inherit the render function from mixins/extend + // set `instance.render` to NOOP so that it can inherit the render + // function from mixins/extend instance.render = (instance.render || Component.render || NOOP) as InternalRenderFunction diff --git a/packages/server-renderer/__tests__/render.spec.ts b/packages/server-renderer/__tests__/render.spec.ts index e2ec13c034..85d537621b 100644 --- a/packages/server-renderer/__tests__/render.spec.ts +++ b/packages/server-renderer/__tests__/render.spec.ts @@ -781,8 +781,10 @@ function testRender(type: string, render: typeof renderToString) { test('effect onInvalidate does not error', async () => { const noop = () => {} const app = createApp({ - setup: () => watchEffect(onInvalidate => onInvalidate(noop)), - render: noop, + setup: () => { + watchEffect(onInvalidate => onInvalidate(noop)) + }, + render: noop }) expect(await render(app)).toBe('') })