Changeset 5315

Timestamp:

04/24/08 21:32:35 (9 months ago)

Author:

aflesler

Message:

- Adding the enhancements to the test runner, to accept multiple(and negative) filters from the GET variables, as specified in the ticket #2738.

Files:

• trunk/jquery/test/data/testrunner.js (modified) (4 diffs)

trunk/jquery/test/data/testrunner.js

@@ -14 +14 @@
 };
 
+_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:');
 
@@ -55 +58 @@
 }
 
-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;
 }
 
@@ -79 +97 @@
         name = _config.currentModule + " module: " + name;
         
-    if (dontrun(name))
+    if ( !validTest(name) )
         return;
         
@@ -229 +247 @@
         }
 
-    return "[ " + r.join(", ") + " ]"
+    return "[ " + r.join(", ") + " ]";
 }