From 8ac4d68eda7cd7fcd642755c65b284cc86ed0f21 Mon Sep 17 00:00:00 2001 From: tanhauhau Date: Fri, 3 Mar 2023 01:09:43 +0800 Subject: [PATCH] fix test --- src/compiler/compile/nodes/Head.ts | 2 +- test/js/samples/collapse-literal-ssr/expected.js | 12 +----------- test/server-side-rendering/index.ts | 7 +++---- .../head-meta-hydrate-duplicate/_expected.html | 4 +--- 4 files changed, 6 insertions(+), 19 deletions(-) diff --git a/src/compiler/compile/nodes/Head.ts b/src/compiler/compile/nodes/Head.ts index c6307222a5..83319092b3 100644 --- a/src/compiler/compile/nodes/Head.ts +++ b/src/compiler/compile/nodes/Head.ts @@ -15,7 +15,7 @@ export default class Head extends Node { constructor(component: Component, parent: Node, scope: TemplateScope, info: TemplateNode) { super(component, parent, scope, info); - this.can_use_innerhtml = false; + this.cannot_use_innerhtml(); if (info.attributes.length) { component.error(info.attributes[0], compiler_errors.invalid_attribute_head); diff --git a/test/js/samples/collapse-literal-ssr/expected.js b/test/js/samples/collapse-literal-ssr/expected.js index 8440a10082..a5102337fc 100644 --- a/test/js/samples/collapse-literal-ssr/expected.js +++ b/test/js/samples/collapse-literal-ssr/expected.js @@ -9,17 +9,7 @@ function foo() { } const Component = create_ssr_component(($$result, $$props, $$bindings, slots) => { - return ` -
-
- - -- -- - - -
-
-
-
-
-
`; + return `
-
- -
-
-
-
`; }); export default Component; \ No newline at end of file diff --git a/test/server-side-rendering/index.ts b/test/server-side-rendering/index.ts index c4078a4885..cbfcba8c21 100644 --- a/test/server-side-rendering/index.ts +++ b/test/server-side-rendering/index.ts @@ -111,11 +111,10 @@ describe('ssr', () => { fs.writeFileSync(`${dir}/_actual-head.html`, head); try { - (compileOptions.hydratable - ? assert.htmlEqualWithComments - : assert.htmlEqual)( + assert.htmlEqualWithOptions( head, - fs.readFileSync(`${dir}/_expected-head.html`, 'utf-8') + fs.readFileSync(`${dir}/_expected-head.html`, "utf-8"), + { preserveComments: compileOptions.hydratable } ); } catch (error) { if (shouldUpdateExpected()) { diff --git a/test/server-side-rendering/samples/head-meta-hydrate-duplicate/_expected.html b/test/server-side-rendering/samples/head-meta-hydrate-duplicate/_expected.html index 02d89d6d18..0946c910dd 100644 --- a/test/server-side-rendering/samples/head-meta-hydrate-duplicate/_expected.html +++ b/test/server-side-rendering/samples/head-meta-hydrate-duplicate/_expected.html @@ -1,3 +1 @@ - - -
Just a dummy page.
\ No newline at end of file +
Just a dummy page.
\ No newline at end of file