X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=test%2Fdata%2Ftestrunner.js;h=0113ae5c85d074f4544730723afa49457dc9f98e;hb=1753ab3d823320da79cccc4041f662f2cfd1e20d;hp=6f426419b91cf70439913d14ebc16b6a097644cc;hpb=f12d94a6282d9efe6ba5863bf0de8a8a8b09a4af;p=jquery.git

diff --git a/test/data/testrunner.js b/test/data/testrunner.js
index 6f42641..0113ae5 100644
--- a/test/data/testrunner.js
+++ b/test/data/testrunner.js
@@ -13,6 +13,9 @@ var _config = {
 	asyncTimeout: 2 // seconds for async timeout
 };
 
+_config.filters = location.search.length > 1 && //restrict modules/tests by get parameters
+		$.map( location.search.slice(1).split('&'), decodeURIComponent );
+
 var isLocal = !!(window.location.protocol == 'file:');
 
 $(function() {
@@ -54,15 +57,31 @@ function start() {
 	}, 13);
 }
 
-function dontrun(name) {
-	var filter = location.search.slice(1);
-	return filter && !new RegExp(filter).test(encodeURIComponent(name));
+function validTest( name ) {
+	var filters = _config.filters;
+	if( !filters )
+		return true;
+
+	var i = filters.length,
+		run = false;
+	while( i-- ){
+		var filter = filters[i],
+			not = filter.charAt(0) == '!';
+		if( not ) 
+			filter = filter.slice(1);
+		if( name.indexOf(filter) != -1 )
+			return !not;
+		if( not )
+			run = true;
+	}
+	return run;
 }
 
 function runTest() {
 	_config.blocking = false;
 	var time = new Date();
 	_config.fixture = document.getElementById('main').innerHTML;
+	_config.ajaxSettings = $.ajaxSettings;
 	synchronize(function() {
 		time = new Date() - time;
 		$("<div>").html(['<p class="result">Tests completed in ',
@@ -78,7 +97,7 @@ function test(name, callback, nowait) {
 	if(_config.currentModule)
 		name = _config.currentModule + " module: " + name;
 		
-	if (dontrun(name))
+	if ( !validTest(name) )
 		return;
 		
 	synchronize(function() {
@@ -166,6 +185,8 @@ function expect(asserts) {
  */
 function reset() {
 	$("#main").html( _config.fixture );
+	$.event.global = {};
+	$.ajaxSettings = $.extend({}, _config.ajaxSettings);
 }
 
 /**
@@ -228,7 +249,7 @@ function serialArray( a ) {
             r.push( str );
         }
 
-	return "[ " + r.join(", ") + " ]"
+	return "[ " + r.join(", ") + " ]";
 }
 
 /**