Skip to content
Permalink
Browse files

test runner: the changes are:

- Replaced all the $ for jQuery in the tests and suite.
- Added a noConflict to testrunner.js.
- Modified the test for noConflict() so that it still work.
- Added jQuery 1.2.1 and 1.2.3 to otherlibs.
  • Loading branch information
flesler committed May 28, 2008
1 parent abb055b commit 9e48649729a5d4cd9ce52bcba067ba33a562cb4b
@@ -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,15 +83,15 @@ function runTest() {
_config.blocking = false;
var time = new Date();
_config.fixture = document.getElementById('main').innerHTML;
_config.ajaxSettings = $.ajaxSettings;
_config.ajaxSettings = jQuery.ajaxSettings;
synchronize(function() {
time = new Date() - time;
$("<div>").html(['<p class="result">Tests completed in ',
jQuery("<div>").html(['<p class="result">Tests completed in ',
time, ' milliseconds.<br/>',
_config.stats.bad, ' tests of ', _config.stats.all, ' failed.</p>']
.join(''))
.appendTo("body");
$("#banner").addClass(_config.stats.bad ? "fail" : "pass");
jQuery("#banner").addClass(_config.stats.bad ? "fail" : "pass");
});
}

@@ -154,11 +156,11 @@ function test(name, callback, nowait) {
else
n.style.display = "none";
};
$(b).dblclick(function(event) {
jQuery(b).dblclick(function(event) {
var target = jQuery(event.target).filter("strong").clone();
if ( target.length ) {
target.children().remove();
location.href = location.href.match(/^(.+?)(\?.*)?$/)[1] + "?" + encodeURIComponent($.trim(target.text()));
location.href = location.href.match(/^(.+?)(\?.*)?$/)[1] + "?" + encodeURIComponent(jQuery.trim(target.text()));
}
});
li.appendChild( b );
@@ -184,14 +186,14 @@ function expect(asserts) {
* Resets the test setup. Useful for tests that modify the DOM.
*/
function reset() {
$("#main").html( _config.fixture );
$.event.global = {};
$.ajaxSettings = $.extend({}, _config.ajaxSettings);
jQuery("#main").html( _config.fixture );
jQuery.event.global = {};
jQuery.ajaxSettings = jQuery.extend({}, _config.ajaxSettings);
}

/**
* Asserts true.
* @example ok( $("a").size() > 5, "There must be at least 5 anchors" );
* @example ok( jQuery("a").size() > 5, "There must be at least 5 anchors" );
*/
function ok(a, msg) {
_config.Test.push( [ !!a, msg ] );
@@ -5,7 +5,12 @@
<title>jQuery Test Suite</title>
<link rel="Stylesheet" media="screen" href="data/testsuite.css" />
<!-- Includes -->
<script type="text/javascript">var jQuery = "jQuery", $ = "$"; // For testing .noConflict()</script>
<script type="text/javascript">
var jQuery = this.jQuery || "jQuery", // For testing .noConflict()
$ = this.$ || "$",
originaljQuery = jQuery,
original$ = $;
</script>
<script type="text/javascript" src="../dist/jquery.js"></script>
<script type="text/javascript" src="data/testrunner.js"></script>
<script type="text/javascript" src="unit/core.js"></script>

Large diffs are not rendered by default.

Large diffs are not rendered by default.

0 comments on commit 9e48649

Please sign in to comment.
You can’t perform that action at this time.