From 73e83e55719d053ad26bf6c2c028bf67f80f966f Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Mon, 16 Apr 2018 00:05:51 -0400
Subject: [PATCH] tidy up

---
 test/helpers.js                              | 3 +--
 test/js/index.js                             | 3 +--
 test/parser/index.js                         | 2 --
 test/runtime/index.js                        | 1 -
 test/runtime/samples/store-nested/_config.js | 2 --
 test/runtime/samples/store-root/_config.js   | 2 --
 test/validator/index.js                      | 3 +--
 7 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/test/helpers.js b/test/helpers.js
index 2b84764c62..0f0a1fd4ae 100644
--- a/test/helpers.js
+++ b/test/helpers.js
@@ -187,8 +187,7 @@ export function showOutput(cwd, options = {}, compile = svelte.compile) {
 			fs.readFileSync(`${cwd}/${file}`, 'utf-8'),
 			Object.assign(options, {
 				filename: file,
-				name: capitalise(name),
-				parser: 'v2' // TODO remove
+				name: capitalise(name)
 			})
 		);
 
diff --git a/test/js/index.js b/test/js/index.js
index 00ef3ead97..1d6e499679 100644
--- a/test/js/index.js
+++ b/test/js/index.js
@@ -25,8 +25,7 @@ describe("js", () => {
 
 			try {
 				const options = Object.assign(config.options || {}, {
-					shared: true,
-					parser: 'v2' // TODO remove
+					shared: true
 				});
 
 				actual = svelte.compile(input, options).js.code.replace(/generated by Svelte v\d+\.\d+\.\d+/, 'generated by Svelte vX.Y.Z');
diff --git a/test/parser/index.js b/test/parser/index.js
index c32c00af25..f2acd631d9 100644
--- a/test/parser/index.js
+++ b/test/parser/index.js
@@ -18,8 +18,6 @@ describe('parse', () => {
 		(solo ? it.only : it)(dir, () => {
 			const options = tryToLoadJson(`test/parser/samples/${dir}/options.json`) || {};
 
-			options.parser = 'v2'; // TODO remove
-
 			const input = fs.readFileSync(`test/parser/samples/${dir}/input.html`, 'utf-8').replace(/\s+$/, '');
 			const expectedOutput = tryToLoadJson(`test/parser/samples/${dir}/output.json`);
 			const expectedError = tryToLoadJson(`test/parser/samples/${dir}/error.json`);
diff --git a/test/runtime/index.js b/test/runtime/index.js
index 109615f309..199a9a0c9b 100644
--- a/test/runtime/index.js
+++ b/test/runtime/index.js
@@ -72,7 +72,6 @@ describe("runtime", () => {
 			compileOptions.dev = config.dev;
 			compileOptions.store = !!config.store;
 			compileOptions.immutable = config.immutable;
-			compileOptions.parser = 'v2'; // TODO remove
 
 			Object.keys(require.cache)
 				.filter(x => x.endsWith(".html"))
diff --git a/test/runtime/samples/store-nested/_config.js b/test/runtime/samples/store-nested/_config.js
index bad5ddeffb..594bd65873 100644
--- a/test/runtime/samples/store-nested/_config.js
+++ b/test/runtime/samples/store-nested/_config.js
@@ -1,6 +1,4 @@
 export default {
-	store: true, // TODO remove this in v2
-
 	html: `
 		<h1>Hello, world!</h1>
 	`,
diff --git a/test/runtime/samples/store-root/_config.js b/test/runtime/samples/store-root/_config.js
index 72658d0038..278cbff30b 100644
--- a/test/runtime/samples/store-root/_config.js
+++ b/test/runtime/samples/store-root/_config.js
@@ -1,6 +1,4 @@
 export default {
-	store: true, // TODO remove this in v2
-
 	html: `
 		<h1>Hello world!</h1>
 		<p>It's nice to see you, world.</p>
diff --git a/test/validator/index.js b/test/validator/index.js
index 72231f4a84..ce89833b7c 100644
--- a/test/validator/index.js
+++ b/test/validator/index.js
@@ -32,8 +32,7 @@ describe("validate", () => {
 						warnings.push({ code, message, pos, loc, end });
 					},
 					dev: config.dev,
-					generate: false,
-					parser: 'v2' // TODO remove
+					generate: false
 				});
 
 				assert.equal(stats.warnings.length, warnings.length);