From d67e615b736f9dc5b09c798ebfd6a22e68348359 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Tue, 12 May 2015 14:49:36 -0400
Subject: [PATCH] Allow foo, fooTest, fooTest.js, and tests/fooTest.js when
 running tests

---
 test/content/runtests.js | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/test/content/runtests.js b/test/content/runtests.js
index cf0354025..c7546535e 100644
--- a/test/content/runtests.js
+++ b/test/content/runtests.js
@@ -100,11 +100,15 @@ if(ZoteroUnit.tests) {
 		}
 	} else {
 		var specifiedTests = ZoteroUnit.tests.split(",");
-		for(var test of specifiedTests) {
-			var fname = test+".js",
-			    file = testDirectory.clone();
+		for (let test of specifiedTests) {
+			// Allow foo, fooTest, fooTest.js, and tests/fooTest.js
+			test = test.replace(/\.js$/, "");
+			test = test.replace(/Test$/, "");
+			test = test.replace(/^tests[/\\]/, "");
+			let fname = test + "Test.js";
+			let file = testDirectory.clone();
 			file.append(fname);
-			if(!file.exists()) {
+			if (!file.exists()) {
 				dump("Invalid test file "+test+"\n");
 				run = false;
 				quit(true);