X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=test%2Fdata%2Ftestrunner.js;h=9d869258e639afec940b84ef828e162a095b72b2;hb=96e4006b74d03319af86b9ed27f7235ee2f8fe6c;hp=bdb938c40781f6ac208efc9bf3f4ea29f6eeb057;hpb=d726a96b1f5008f29097f1efbea9a987015af641;p=jquery.git diff --git a/test/data/testrunner.js b/test/data/testrunner.js index bdb938c..9d86925 100644 --- a/test/data/testrunner.js +++ b/test/data/testrunner.js @@ -1,3 +1,5 @@ +jQuery.noConflict(); // Allow the test to run with other libs or jQuery's. + var _config = { fixture: null, Test: [], @@ -14,12 +16,12 @@ var _config = { }; _config.filters = location.search.length > 1 && //restrict modules/tests by get parameters - $.map( location.search.slice(1).split('&'), decodeURIComponent ); + jQuery.map( location.search.slice(1).split('&'), decodeURIComponent ); var isLocal = !!(window.location.protocol == 'file:'); -$(function() { - $('#userAgent').html(navigator.userAgent); +jQuery(function() { + jQuery('#userAgent').html(navigator.userAgent); runTest(); }); @@ -81,14 +83,15 @@ function runTest() { _config.blocking = false; var time = new Date(); _config.fixture = document.getElementById('main').innerHTML; + _config.ajaxSettings = jQuery.ajaxSettings; synchronize(function() { time = new Date() - time; - $("
Tests completed in ', + jQuery("
Tests completed in ',
time, ' milliseconds.
',
_config.stats.bad, ' tests of ', _config.stats.all, ' failed.