From ca18d8acc4701a212d7f32038a7dfa5e8883f536 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Sun, 24 Mar 2024 11:17:57 -0400
Subject: [PATCH] update tests

---
 packages/svelte/tests/html_equal.js                       | 8 ++++----
 .../tests/runtime-legacy/samples/pre-tag/_config.js       | 4 ++--
 .../samples/raw-anchor-first-child/_config.js             | 2 +-
 .../runtime-legacy/samples/textarea-content/_config.js    | 6 +++---
 .../samples/comment-preserve/_expected.html               | 6 +-----
 .../samples/head-meta-hydrate-duplicate/_expected.html    | 2 +-
 6 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/packages/svelte/tests/html_equal.js b/packages/svelte/tests/html_equal.js
index 96b642ffd0..a53f3ef35e 100644
--- a/packages/svelte/tests/html_equal.js
+++ b/packages/svelte/tests/html_equal.js
@@ -135,15 +135,15 @@ export function setup_html_equal(options = {}) {
 		try {
 			assert.deepEqual(
 				withoutNormalizeHtml
-					? normalize_new_line(actual)
+					? normalize_new_line(actual.trim())
 							.replace(/(\sdata-svelte-h="[^"]+")/g, options.removeDataSvelte ? '' : '$1')
 							.replace(/(<!(--)?.*?\2>)/g, preserveComments !== false ? '$1' : '')
-					: normalize_html(window, actual, { ...options, preserveComments }),
+					: normalize_html(window, actual.trim(), { ...options, preserveComments }),
 				withoutNormalizeHtml
-					? normalize_new_line(expected)
+					? normalize_new_line(expected.trim())
 							.replace(/(\sdata-svelte-h="[^"]+")/g, options.removeDataSvelte ? '' : '$1')
 							.replace(/(<!(--)?.*?\2>)/g, preserveComments !== false ? '$1' : '')
-					: normalize_html(window, expected, { ...options, preserveComments }),
+					: normalize_html(window, expected.trim(), { ...options, preserveComments }),
 				message
 			);
 		} catch (e) {
diff --git a/packages/svelte/tests/runtime-legacy/samples/pre-tag/_config.js b/packages/svelte/tests/runtime-legacy/samples/pre-tag/_config.js
index d5a18488e2..3f28031a05 100644
--- a/packages/svelte/tests/runtime-legacy/samples/pre-tag/_config.js
+++ b/packages/svelte/tests/runtime-legacy/samples/pre-tag/_config.js
@@ -12,7 +12,7 @@ function get_html(ssr) {
 	// ssr rendered HTML has an extra newline prefixed within `<pre>` tag,
 	// if the <pre> tag starts with `\n`
 	// because when browser parses the SSR rendered HTML, it will ignore the 1st '\n' character
-	return `${ssr ? '<!--ssr:0-->' : ''}<pre id="pre">  A
+	return `${ssr ? '<!--[-->' : ''}<pre id="pre">  A
   B
   <span>
     C
@@ -35,5 +35,5 @@ function get_html(ssr) {
 leading newlines</pre></div> <div id="pre-without-leading-newline"><pre>without spaces</pre> <pre>  with spaces  </pre> <pre>${' '}
 newline after leading space</pre></div> <pre id="pre-with-multiple-leading-newlines">
 
-multiple leading newlines</pre>${ssr ? '<!--ssr:0-->' : ''}`;
+multiple leading newlines</pre>${ssr ? '<!--]-->' : ''}`;
 }
diff --git a/packages/svelte/tests/runtime-legacy/samples/raw-anchor-first-child/_config.js b/packages/svelte/tests/runtime-legacy/samples/raw-anchor-first-child/_config.js
index c9137c3ca9..f575b3274e 100644
--- a/packages/svelte/tests/runtime-legacy/samples/raw-anchor-first-child/_config.js
+++ b/packages/svelte/tests/runtime-legacy/samples/raw-anchor-first-child/_config.js
@@ -11,7 +11,7 @@ export default test({
 		if (variant === 'dom') {
 			assert.ok(!span.previousSibling);
 		} else {
-			assert.ok(span.previousSibling?.textContent?.startsWith('ssr:')); // ssr commment node
+			assert.ok(span.previousSibling?.textContent === '['); // ssr commment node
 		}
 
 		component.raw = '<span>bar</span>';
diff --git a/packages/svelte/tests/runtime-legacy/samples/textarea-content/_config.js b/packages/svelte/tests/runtime-legacy/samples/textarea-content/_config.js
index 080976c518..7cd7c553e0 100644
--- a/packages/svelte/tests/runtime-legacy/samples/textarea-content/_config.js
+++ b/packages/svelte/tests/runtime-legacy/samples/textarea-content/_config.js
@@ -4,17 +4,17 @@ export default test({
 	withoutNormalizeHtml: true,
 	// Unable to test `html` with `<textarea>` content
 	// as the textarea#value will not show within `innerHtml`
-	ssrHtml: `<!--ssr:0--><textarea id="textarea">  A
+	ssrHtml: `<!--[--><textarea id="textarea">  A
   B
 </textarea> <div id="div-with-textarea"><textarea>    A
     B
   </textarea></div> <div id="textarea-with-leading-newline"><textarea>leading newline</textarea> <textarea>  leading newline and spaces</textarea> <textarea>
-leading newlines</textarea></div> <div id="textarea-without-leading-newline"><textarea>without spaces</textarea> <textarea>  with spaces  </textarea> <textarea> 
+leading newlines</textarea></div> <div id="textarea-without-leading-newline"><textarea>without spaces</textarea> <textarea>  with spaces  </textarea> <textarea>${' '}
 newline after leading space</textarea></div> <textarea id="textarea-with-multiple-leading-newlines">
 
 multiple leading newlines</textarea> <div id="div-with-textarea-with-multiple-leading-newlines"><textarea>
 
-multiple leading newlines</textarea></div><!--ssr:0-->`,
+multiple leading newlines</textarea></div><!--]-->`,
 	test({ assert, target }) {
 		// Test for <textarea> tag
 		const elementTextarea = /** @type {HTMLTextAreaElement} */ (target.querySelector('#textarea'));
diff --git a/packages/svelte/tests/server-side-rendering/samples/comment-preserve/_expected.html b/packages/svelte/tests/server-side-rendering/samples/comment-preserve/_expected.html
index a3ab0f8ea6..20b49122af 100644
--- a/packages/svelte/tests/server-side-rendering/samples/comment-preserve/_expected.html
+++ b/packages/svelte/tests/server-side-rendering/samples/comment-preserve/_expected.html
@@ -1,5 +1 @@
-<!--ssr:0-->
-<p>before</p>
-<!-- a comment -->
-<p>after</p>
-<!--ssr:0-->
+<![><p>before</p><!-- a comment --><p>after</p><!]>
diff --git a/packages/svelte/tests/server-side-rendering/samples/head-meta-hydrate-duplicate/_expected.html b/packages/svelte/tests/server-side-rendering/samples/head-meta-hydrate-duplicate/_expected.html
index b43330ef0a..57d9395215 100644
--- a/packages/svelte/tests/server-side-rendering/samples/head-meta-hydrate-duplicate/_expected.html
+++ b/packages/svelte/tests/server-side-rendering/samples/head-meta-hydrate-duplicate/_expected.html
@@ -1 +1 @@
-<!ssr:0><div>Just a dummy page.</div><!ssr:0>
+<![><div>Just a dummy page.</div><!]>