From 0a31cfee3bb5083d11d4455586b4f8d1cbc4e392 Mon Sep 17 00:00:00 2001
From: Paul Sauve <paul@burngames.net>
Date: Mon, 23 Jan 2017 14:58:32 -0600
Subject: [PATCH 1/2] Work on skipping some tests

---
 test/generator/onrender-fires-when-ready-nested/_config.js | 2 ++
 test/generator/onrender-fires-when-ready/_config.js        | 2 ++
 test/generator/set-in-observe/_config.js                   | 2 ++
 test/generator/set-in-onrender/_config.js                  | 2 ++
 test/ssr.js                                                | 2 +-
 5 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/test/generator/onrender-fires-when-ready-nested/_config.js b/test/generator/onrender-fires-when-ready-nested/_config.js
index 06327ebc4d..cbc0b87604 100644
--- a/test/generator/onrender-fires-when-ready-nested/_config.js
+++ b/test/generator/onrender-fires-when-ready-nested/_config.js
@@ -1,3 +1,5 @@
 export default {
+	'skip-ssr': true, // uses onrender
+
 	html: `<div><p>true</p>\n<p>true</p></div>`
 };
diff --git a/test/generator/onrender-fires-when-ready/_config.js b/test/generator/onrender-fires-when-ready/_config.js
index 14db20be9e..6ed7e85e9c 100644
--- a/test/generator/onrender-fires-when-ready/_config.js
+++ b/test/generator/onrender-fires-when-ready/_config.js
@@ -1,4 +1,6 @@
 export default {
+	'skip-ssr': true, // uses onrender
+
 	html: `<div><p>true</p></div>`,
 
 	test ( assert, component, target ) {
diff --git a/test/generator/set-in-observe/_config.js b/test/generator/set-in-observe/_config.js
index 81c02623cd..65d993fdb9 100644
--- a/test/generator/set-in-observe/_config.js
+++ b/test/generator/set-in-observe/_config.js
@@ -1,4 +1,6 @@
 export default {
+	'skip-ssr': true, // uses onrender
+
 	html: `
 		<p>1</p>
 		<p>2</p>
diff --git a/test/generator/set-in-onrender/_config.js b/test/generator/set-in-onrender/_config.js
index 1eb52e9522..6cd361c076 100644
--- a/test/generator/set-in-onrender/_config.js
+++ b/test/generator/set-in-onrender/_config.js
@@ -1,3 +1,5 @@
 export default {
+	'skip-ssr': true, // uses onrender
+
 	html: '<p>2</p>'
 };
diff --git a/test/ssr.js b/test/ssr.js
index 2560c1d3be..2ee993bbcf 100644
--- a/test/ssr.js
+++ b/test/ssr.js
@@ -58,7 +58,7 @@ describe( 'ssr', () => {
 			throw new Error( 'Forgot to remove `solo: true` from test' );
 		}
 
-		( config.skip ? it.skip : config.solo ? it.only : it )( dir, () => {
+		( config.skip || config['skip-ssr'] ? it.skip : config.solo ? it.only : it )( dir, () => {
 			try {
 				const source = fs.readFileSync( `test/generator/${dir}/main.html`, 'utf-8' );
 				svelte.compile( source, { generate: 'ssr' });

From 25bfdf4009d1c9fdea90b12496623946ed81d4af Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Tue, 24 Jan 2017 12:04:20 -0500
Subject: [PATCH 2/2] don't mark `skip-ssr` tests as skipped, omit them
 altogether

---
 test/ssr.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/test/ssr.js b/test/ssr.js
index 2ee993bbcf..d03b1b8d06 100644
--- a/test/ssr.js
+++ b/test/ssr.js
@@ -57,8 +57,10 @@ describe( 'ssr', () => {
 		if ( config.solo && process.env.CI ) {
 			throw new Error( 'Forgot to remove `solo: true` from test' );
 		}
+		
+		if ( config['skip-ssr'] ) return;
 
-		( config.skip || config['skip-ssr'] ? it.skip : config.solo ? it.only : it )( dir, () => {
+		( config.skip ? it.skip : config.solo ? it.only : it )( dir, () => {
 			try {
 				const source = fs.readFileSync( `test/generator/${dir}/main.html`, 'utf-8' );
 				svelte.compile( source, { generate: 'ssr' });