X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Fdata%2Ftestrunner.js;h=6f426419b91cf70439913d14ebc16b6a097644cc;hb=f8e5fd6fef68d243d22c593584aaf4ee549ed30c;hp=69377e45216b48970067d81f551148c103534bc4;hpb=b4e23b5af0820a66c2e275051f613f3df9a4444d;p=jquery.git

diff --git a/test/data/testrunner.js b/test/data/testrunner.js
index 69377e4..6f42641 100644
--- a/test/data/testrunner.js
+++ b/test/data/testrunner.js
@@ -54,6 +54,11 @@ function start() {
 	}, 13);
 }
 
+function dontrun(name) {
+	var filter = location.search.slice(1);
+	return filter && !new RegExp(filter).test(encodeURIComponent(name));
+}
+
 function runTest() {
 	_config.blocking = false;
 	var time = new Date();
@@ -73,8 +78,7 @@ function test(name, callback, nowait) {
 	if(_config.currentModule)
 		name = _config.currentModule + " module: " + name;
 		
-	var filter = location.search.slice(1);
-	if ( filter && encodeURIComponent(name).indexOf(filter) == -1 )
+	if (dontrun(name))
 		return;
 		
 	synchronize(function() {
@@ -161,7 +165,7 @@ function expect(asserts) {
  * Resets the test setup. Useful for tests that modify the DOM.
  */
 function reset() {
-	document.getElementById('main').innerHTML = _config.fixture;
+	$("#main").html( _config.fixture );
 }
 
 /**
@@ -273,8 +277,8 @@ function url(value) {
  *
  * @example equals( "Expected 2 characters.", v.formatMessage("Expected {0} characters.", 2) );
  *
- * @param Object expected
  * @param Object actual
+ * @param Object expected
  * @param String message (optional)
  */
 function equals(actual, expected, message) {