Added smoke test target to Jakefile

jamesshore · jamesshore · commit abff1811c19e · 2013-04-22T12:57:58.000-07:00
diff --git a/Jakefile.js b/Jakefile.js
@@ -56,7 +56,7 @@
 	});
 
 	desc("Test everything");
-	task("test", ["testServer", "testClient"]);
+	task("test", ["testServer", "testClient", "testSmoke"]);
 
 	desc("Test server code");
 	task("testServer", ["nodeVersion", TEMP_TESTFILE_DIR], function() {
@@ -68,6 +68,11 @@
 		testacular.runTests(SUPPORTED_BROWSERS, complete, fail);
 	}, {async: true});
 
+	desc("End-to-end smoke tests");
+	task("testSmoke", function() {
+		nodeunit.runTests(smokeTestFiles(), complete, fail);
+	}, {async: true});
+
 	desc("Deploy to Heroku");
 	task("deploy", ["default"], function() {
 		console.log("1. Make sure 'git status' is clean.");
@@ -115,6 +120,12 @@
 	function serverTestFiles() {
 		var testFiles = new jake.FileList();
 		testFiles.include("src/server/**/_*_test.js");
+		testFiles = testFiles.toArray();
+		return testFiles;
+	}
+
+	function smokeTestFiles() {
+		var testFiles = new jake.FileList();
 		testFiles.include("src/_*_test.js");
 		testFiles = testFiles.toArray();
 		return testFiles;
@@ -123,6 +134,7 @@
 	function nodeLintFiles() {
 		var javascriptFiles = new jake.FileList();
 		javascriptFiles.include("*.js");
+		javascriptFiles.include("build/util/*.js");
 		javascriptFiles.include("src/server/**/*.js");
 		javascriptFiles.include("src/*.js");
 		return javascriptFiles.toArray();
diff --git a/build/util/version_checker.js b/build/util/version_checker.js
@@ -8,8 +8,8 @@
 				" [" + expectedString + "], but was [" + actualString + "].");
 		}
 
-		var expected = parseNodeVersion("expected Node version", expectedString);
-		var actual = parseNodeVersion("Node version", actualString);
+		var expected = parseNodeVersion("expected Node version", expectedString, fail);
+		var actual = parseNodeVersion("Node version", actualString, fail);
 
 		if (!process.env.loose) {
 			if (actual[0] !== expected[0] || actual[1] !== expected[1] || actual[2] !== expected[2]) {
@@ -23,7 +23,7 @@
 		}
 	};
 
-	function parseNodeVersion(description, versionString) {
+	function parseNodeVersion(description, versionString, fail) {
 		var versionMatcher = /^v(\d+)\.(\d+)\.(\d+)(\-|$)/;    // v[major].[minor].[bugfix]
 		var versionInfo = versionString.match(versionMatcher);
 		if (versionInfo === null) fail("Could not parse " + description + " (was '" + versionString + "')");
diff --git a/wwp.png b/wwp.png
