From 8a2813fb4ba572a97012fc225ede0dc2ac722a16 Mon Sep 17 00:00:00 2001
From: Rich-Harris <richard.a.harris@gmail.com>
Date: Tue, 22 Nov 2016 13:20:42 -0500
Subject: [PATCH] add assert.htmlEqual helper

---
 test/compiler/if-block-else/_config.js | 24 ++++++++--
 test/test.js                           | 65 ++++++++++++++++++++++++--
 2 files changed, 82 insertions(+), 7 deletions(-)

diff --git a/test/compiler/if-block-else/_config.js b/test/compiler/if-block-else/_config.js
index 37df9e0daf..a6a365624f 100644
--- a/test/compiler/if-block-else/_config.js
+++ b/test/compiler/if-block-else/_config.js
@@ -3,13 +3,29 @@ export default {
 		foo: true,
 		bar: false
 	},
-	html: '<p>foo</p><!--#if foo-->\n\n<p>not bar</p><!--#if bar-->',
+
+	html: `
+		<p>foo</p>
+		<p>not bar</p>
+	`,
+
 	test ( assert, component, target ) {
 		component.set({ foo: false });
-		assert.equal( target.innerHTML, '<p>not foo</p><!--#if foo-->\n\n<p>not bar</p><!--#if bar-->' );
+		assert.htmlEqual( target.innerHTML, `
+			<p>not foo</p>
+			<p>not bar</p>
+		` );
+
 		component.set({ bar: true });
-		assert.equal( target.innerHTML, '<p>not foo</p><!--#if foo-->\n\n<p>bar</p><!--#if bar-->' );
+		assert.htmlEqual( target.innerHTML, `
+			<p>not foo</p>
+			<p>bar</p>
+		` );
+
 		component.set({ foo: true });
-		assert.equal( target.innerHTML, '<p>foo</p><!--#if foo-->\n\n<p>bar</p><!--#if bar-->' );
+		assert.htmlEqual( target.innerHTML, `
+			<p>foo</p>
+			<p>bar</p>
+		` );
 	}
 };
diff --git a/test/test.js b/test/test.js
index d748feb092..0118733a1f 100644
--- a/test/test.js
+++ b/test/test.js
@@ -5,8 +5,8 @@ import * as path from 'path';
 import * as fs from 'fs';
 import jsdom from 'jsdom';
 
-import consoleGroup from 'console-group';
-consoleGroup.install();
+import { install } from 'console-group';
+install();
 
 const cache = {};
 
@@ -59,6 +59,65 @@ describe( 'svelte', () => {
 	});
 
 	describe( 'compiler', () => {
+		before( () => {
+			function cleanChildren ( node ) {
+				let previous = null;
+
+				[ ...node.childNodes ].forEach( child => {
+					if ( child.nodeType === 8 ) {
+						// comment
+						node.removeChild( child );
+						return;
+					}
+
+					if ( child.nodeType === 3 ) {
+						child.data = child.data.replace( /\s{2,}/, ' ' );
+
+						// text
+						if ( previous && previous.nodeType === 3 ) {
+							previous.data += child.data;
+							previous.data = previous.data.replace( /\s{2,}/, ' ' );
+
+							node.removeChild( child );
+						}
+					}
+
+					else {
+						cleanChildren( child );
+					}
+
+					previous = child;
+				});
+
+				// collapse whitespace
+				if ( node.firstChild && node.firstChild.nodeType === 3 ) {
+					node.firstChild.data = node.firstChild.data.replace( /^\s+/, '' );
+					if ( !node.firstChild.data ) node.removeChild( node.firstChild );
+				}
+
+				if ( node.lastChild && node.lastChild.nodeType === 3 ) {
+					node.lastChild.data = node.lastChild.data.replace( /\s+$/, '' );
+					if ( !node.lastChild.data ) node.removeChild( node.lastChild );
+				}
+			}
+
+			return env().then( window => {
+				assert.htmlEqual = ( actual, expected, message ) => {
+					window.document.body.innerHTML = actual.trim();
+					cleanChildren( window.document.body, '' );
+					actual = window.document.body.innerHTML;
+
+					window.document.body.innerHTML = expected.trim();
+					cleanChildren( window.document.body, '' );
+					expected = window.document.body.innerHTML;
+
+					assert.deepEqual( actual, expected, message );
+				};
+
+				assert.htmlEqual( ' <p>  foo</p>  ', '<p>foo</p>' );
+			});
+		});
+
 		function loadConfig ( dir ) {
 			try {
 				return require( `./compiler/${dir}/_config.js` ).default;
@@ -137,7 +196,7 @@ describe( 'svelte', () => {
 						});
 
 						if ( config.html ) {
-							assert.equal( target.innerHTML, config.html );
+							assert.htmlEqual( target.innerHTML, config.html );
 						}
 
 						if ( config.test ) {