From 1143b0a991e8c3cf82c8ed1949a78bfd67f72d42 Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Sun, 15 Apr 2018 22:19:05 -0400
Subject: [PATCH] remove v1 tests

---
 test/validator/index.js | 104 ++++++++++++++++++----------------------
 1 file changed, 46 insertions(+), 58 deletions(-)

diff --git a/test/validator/index.js b/test/validator/index.js
index 16e84e63aa..72231f4a84 100644
--- a/test/validator/index.js
+++ b/test/validator/index.js
@@ -17,70 +17,58 @@ describe("validate", () => {
 		(solo ? it.only : skip ? it.skip : it)(dir, () => {
 			const config = loadConfig(`./validator/samples/${dir}/_config.js`);
 
-			function test(input, expectedWarnings, expectedErrors) {
-				let error;
-
-				try {
-					const warnings = [];
-
-					const { stats } = svelte.compile(input, {
-						onwarn(warning) {
-							const { code, message, pos, loc, end } = warning;
-							warnings.push({ code, message, pos, loc, end });
-						},
-						dev: config.dev,
-						generate: false
-					});
-
-					assert.equal(stats.warnings.length, warnings.length);
-					stats.warnings.forEach((full, i) => {
-						const lite = warnings[i];
-						assert.deepEqual({
-							code: full.code,
-							message: full.message,
-							pos: full.pos,
-							loc: full.loc,
-							end: full.end
-						}, lite);
-					});
-
-					assert.deepEqual(warnings, expectedWarnings);
-				} catch (e) {
-					error = e;
-				}
+			const input = fs.readFileSync(`test/validator/samples/${dir}/input.html`, "utf-8").replace(/\s+$/, "");
+			const expectedWarnings = tryToLoadJson(`test/validator/samples/${dir}/warnings.json`) || [];
+			const expectedErrors = tryToLoadJson(`test/validator/samples/${dir}/errors.json`);
+
+			let error;
+
+			try {
+				const warnings = [];
+
+				const { stats } = svelte.compile(input, {
+					onwarn(warning) {
+						const { code, message, pos, loc, end } = warning;
+						warnings.push({ code, message, pos, loc, end });
+					},
+					dev: config.dev,
+					generate: false,
+					parser: 'v2' // TODO remove
+				});
 
-				const expected = expectedErrors && expectedErrors[0];
+				assert.equal(stats.warnings.length, warnings.length);
+				stats.warnings.forEach((full, i) => {
+					const lite = warnings[i];
+					assert.deepEqual({
+						code: full.code,
+						message: full.message,
+						pos: full.pos,
+						loc: full.loc,
+						end: full.end
+					}, lite);
+				});
 
-				if (error || expected) {
-					if (error && !expected) {
-						throw error;
-					}
+				assert.deepEqual(warnings, expectedWarnings);
+			} catch (e) {
+				error = e;
+			}
 
-					if (expected && !error) {
-						throw new Error(`Expected an error: ${expected.message}`);
-					}
+			const expected = expectedErrors && expectedErrors[0];
 
-					assert.equal(error.code, expected.code);
-					assert.equal(error.message, expected.message);
-					assert.deepEqual(error.loc, expected.loc);
-					assert.deepEqual(error.end, expected.end);
-					assert.equal(error.pos, expected.pos);
+			if (error || expected) {
+				if (error && !expected) {
+					throw error;
+				}
+
+				if (expected && !error) {
+					throw new Error(`Expected an error: ${expected.message}`);
 				}
-			}
 
-			// TODO remove the v1 tests
-			test(
-				fs.readFileSync(`test/validator/samples/${dir}/input.html`, "utf-8").replace(/\s+$/, ""),
-				tryToLoadJson(`test/validator/samples/${dir}/warnings.json`) || [],
-				tryToLoadJson(`test/validator/samples/${dir}/errors.json`)
-			);
-
-			if (fs.existsSync(`test/validator/samples/${dir}/input-v2.html`)) {
-				test(
-					fs.readFileSync(`test/validator/samples/${dir}/input-v2.html`, "utf-8").replace(/\s+$/, ""),
-					tryToLoadJson(`test/validator/samples/${dir}/warnings-v2.json`) || [],
-					tryToLoadJson(`test/validator/samples/${dir}/errors-v2.json`)
-				);
+				assert.equal(error.code, expected.code);
+				assert.equal(error.message, expected.message);
+				assert.deepEqual(error.loc, expected.loc);
+				assert.deepEqual(error.end, expected.end);
+				assert.equal(error.pos, expected.pos);
 			}
 		});
 	});