flutable
diff --git a/‎Jakefile.js‎
Lines changed: 12 additions & 2 deletions b/‎Jakefile.js‎
Lines changed: 12 additions & 2 deletions
diff --git a/‎readme.md‎
Lines changed: 2 additions & 0 deletions b/‎readme.md‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎todo.txt‎
Lines changed: 2 additions & 4 deletions b/‎todo.txt‎
Lines changed: 2 additions & 4 deletions
@@ -15,6 +15,8 @@
 	var strict = !process.env.loose;
 	if (strict) console.log("For more forgiving test settings, use 'loose=true'");
 
+	var itonly = process.env.itonly;
+
 	//*** DIRECTORIES
 
 	directory(paths.tempTestfileDir);
@@ -102,7 +104,7 @@
 			configFile: paths.karmaConfig,
 			browsers: testedBrowsers(),
 			strict: strict,
-			clientArgs: [ "--grep=JS:" ]
+			clientArgs: testSubsetArgs("JS")
 		}, complete, fail);
 	});
 
@@ -112,10 +114,18 @@
 			configFile: paths.karmaConfig,
 			browsers: testedBrowsers(),
 			strict: strict,
-			clientArgs: [ "--grep=CSS:" ]
+			clientArgs: testSubsetArgs("CSS")
 		}, complete, fail);
 	});
 
+	function testSubsetArgs(tag) {
+		// We use Mocha's "grep" feature as a poor-man's substitute for proper test tagging and subsetting
+		// (which Mocha doesn't have at the time of this writing). However, Mocha's grep option disables
+		// Mocha's "it.only()" feature. So we don't use grep if the "itonly" option is set on the command
+		// line.
+		return itonly ? [] : [ "--grep=" + tag + ":" ];
+	}
+
 	desc("End-to-end smoke tests");
 	task("smoketest", [ "build" ], function() {
 		console.log("Smoke testing app: ");
 
@@ -74,6 +74,8 @@ To build and test this episode:
 
 You can also run `./jake.sh quick loose=true` for a faster but less thorough set of tests.
 
+If you want to use Mocha's `it.only()` feature to run just one test, pass `itonly=true` as well.
+
 *Note:* The master branch is not guaranteed to build successfully. For a known-good build (tested on Mac and Windows, and assumed to work on Linux), use the integration branch. To change branches, follow the steps under "Running old episodes" (above), but replace `episodeXX` with `integration` (for the known-good integration branch) or `master` (for the latest code).
 
 
 
@@ -29,11 +29,9 @@ User Stories to finish current MMF:
 - release
 
 Engineering Tasks:
-* Run server code out of generated/dist as well (fix hardcoded path in weewikipaint.js)
-- Restore 'it.only()' functionality of client test build (conflicts with grep-based test subsetting)
+* Restore 'it.only()' functionality of client test build (conflicts with grep-based test subsetting)
 - Is there a better of handling cross-directory requires (e.g., `require("../shared/_assert.js")` broke)?
 - Where do we want our vendor files to live?
 - Move hard-coded paths in Jakefile.js to paths.js?
 
-To Do on current task:
-- Rename weewikipaint.js --> run.js?
+To Do on current task: