From 61daba7a64f32634561b1622916c2675a5ae128d Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Sat, 20 Jan 2018 12:40:31 -0500
Subject: [PATCH] add hydration test, add window.init function to make it
 possible

---
 test/app/templates/main.js |  8 ++++----
 test/common/test.js        | 37 +++++++++++++++++++++++++++++--------
 2 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/test/app/templates/main.js b/test/app/templates/main.js
index 2771f93..6bfcae9 100644
--- a/test/app/templates/main.js
+++ b/test/app/templates/main.js
@@ -1,6 +1,6 @@
 import { init } from '../../../runtime.js';
 
-// `routes` is an array of route objects injected by Sapper
-init(document.querySelector('#sapper'), __routes__);
-
-window.READY = true;
\ No newline at end of file
+window.init = () => {
+	init(document.querySelector('#sapper'), __routes__);
+	window.READY = true;
+};
\ No newline at end of file
diff --git a/test/common/test.js b/test/common/test.js
index adc0933..8fd9988 100644
--- a/test/common/test.js
+++ b/test/common/test.js
@@ -92,6 +92,10 @@ function run(env) {
 				PORT = port;
 				base = `http://localhost:${PORT}`;
 
+				Nightmare.action('init', function(done) {
+					this.evaluate_now(() => window.init(), done);
+				});
+
 				global.fetch = (url, opts) => {
 					if (url[0] === '/') url = `${base}${url}`;
 					return fetch(url, opts);
@@ -175,7 +179,7 @@ function run(env) {
 			});
 
 			it('navigates to a new page without reloading', () => {
-				return nightmare.goto(base).wait(() => window.READY).wait(200)
+				return nightmare.goto(base).init().wait(200)
 					.then(() => {
 						return capture(() => nightmare.click('a[href="/about"]'));
 					})
@@ -195,7 +199,8 @@ function run(env) {
 			it('navigates programmatically', () => {
 				return nightmare
 					.goto(`${base}/about`)
-					.wait(() => window.READY)
+					.init()
+					.wait(100)
 					.click('.goto')
 					.wait(() => window.location.pathname === '/blog/what-is-sapper')
 					.wait(100)
@@ -208,7 +213,8 @@ function run(env) {
 			it('prefetches programmatically', () => {
 				return nightmare
 					.goto(`${base}/about`)
-					.wait(() => window.READY)
+					.init()
+					.wait(100)
 					.then(() => {
 						return capture(() => {
 							return nightmare
@@ -224,7 +230,7 @@ function run(env) {
 			it('scrolls to active deeplink', () => {
 				return nightmare
 					.goto(`${base}/blog/a-very-long-post#four`)
-					.wait(() => window.READY)
+					.init()
 					.wait(100)
 					.evaluate(() => window.scrollY)
 					.then(scrollY => {
@@ -235,7 +241,7 @@ function run(env) {
 			it('reuses prefetch promise', () => {
 				return nightmare
 					.goto(`${base}/blog`)
-					.wait(() => window.READY)
+					.init()
 					.wait(200)
 					.then(() => {
 						return capture(() => {
@@ -263,7 +269,7 @@ function run(env) {
 			it('cancels navigation if subsequent navigation occurs during preload', () => {
 				return nightmare
 					.goto(base)
-					.wait(() => window.READY)
+					.init()
 					.click('a[href="/slow-preload"]')
 					.wait(100)
 					.click('a[href="/about"]')
@@ -290,7 +296,7 @@ function run(env) {
 			it('passes entire request object to preload', () => {
 				return nightmare
 					.goto(`${base}/show-url`)
-					.wait(() => window.READY)
+					.init()
 					.evaluate(() => document.querySelector('p').innerHTML)
 					.end().then(html => {
 						assert.equal(html, `URL is /show-url`);
@@ -300,7 +306,7 @@ function run(env) {
 			it('calls a delete handler', () => {
 				return nightmare
 					.goto(`${base}/delete-test`)
-					.wait(() => window.READY)
+					.init().wait(100)
 					.click('.del')
 					.wait(() => window.deleted)
 					.evaluate(() => window.deleted.id)
@@ -308,6 +314,21 @@ function run(env) {
 						assert.equal(id, 42);
 					});
 			});
+
+			it('hydrates initial route', () => {
+				return nightmare.goto(base)
+					.wait('h1')
+					.evaluate(() => {
+						window.h1 = document.querySelector('h1');
+					})
+					.init().wait(100)
+					.evaluate(() => {
+						return document.querySelector('h1') === window.h1;
+					})
+					.then(matches => {
+						assert.ok(matches);
+					});
+			});
 		});
 
 		describe('headers', () => {