Showing with 21 additions and 18 deletions.
  1. +6 −3 test/data/testinit.js
  2. +1 −4 test/data/testrunner.js
  3. +14 −11 test/unit/core.js
@@ -1,10 +1,13 @@
/*jshint multistr:true*/
/*jshint multistr:true */

var jQuery = this.jQuery || "jQuery", // For testing .noConflict()
$ = this.$ || "$",
originaljQuery = jQuery,
original$ = $,
hasPHP = true,
// Disable Ajax tests to reduce network strain
// Re-enabled (at least the variable should be declared)
isLocal = window.location.protocol === "file:",
amdDefined;

/**
@@ -123,7 +126,7 @@ if ( document.createEvent ) {
* @result "data/test.php?foo=bar&10538358345554"
*/
function url( value ) {
return value + (/\?/.test(value) ? "&" : "?") + new Date().getTime() + "" + parseInt(Math.random()*100000);
return value + (/\?/.test(value) ? "&" : "?") + new Date().getTime() + "" + parseInt(Math.random() * 100000, 10);
}

(function () {
@@ -226,7 +229,7 @@ function url( value ) {
jQuery( "<iframe/>" ).attr( "src", url( "./data/" + fileName ) )
).appendTo( "body" );
});
}
};
}());

// Sandbox start for great justice
@@ -123,7 +123,7 @@ function testSubproject( label, url, risTests ) {
}

fnTest.apply( this, arguments );
}
};
}
}

@@ -167,8 +167,5 @@ QUnit.config.testTimeout = 20 * 1000; // 20 seconds
return;
}

// (Temporarily) Disable Ajax tests to reduce network strain
// isLocal = QUnit.isLocal = true;

document.write("<scr" + "ipt src='http://swarm.jquery.org/js/inject.js?" + (new Date).getTime() + "'></scr" + "ipt>");
})();
@@ -2,8 +2,8 @@ module("core", { teardown: moduleTeardown });

test("Unit Testing Environment", function () {
expect(2);
ok( hasPHP, "Running Unit tests without PHP is unsupported! The AJAX tests won't run without it and don't expect all tests to pass without it!" );
ok( !isLocal, "Unit tests shouldn't be run from file://, especially in Chrome. If you must test from file:// with Chrome, run it with the --allow-file-access-from-files flag!" );
ok( hasPHP, "Running in an environment with PHP support. The AJAX tests only run if the environment supports PHP!" );
ok( !isLocal, "Unit tests are not ran from file:// (especially in Chrome. If you must test from file:// with Chrome, run it with the --allow-file-access-from-files flag!)" );
});

test("Basic requirements", function() {
@@ -601,7 +601,7 @@ test("isWindow", function() {
});

test("jQuery('html')", function() {
expect( 18 );
expect( 15 );

QUnit.reset();
jQuery["foo"] = false;
@@ -638,19 +638,22 @@ test("jQuery('html')", function() {
// equal( jQuery("element[attribute=<div></div>]").length, 0, "When html is within brackets, do not recognize as html." );
// equal( jQuery("element:not(<div></div>)").length, 0, "When html is within parens, do not recognize as html." );
// equal( jQuery("\\<div\\>").length, 0, "Ignore escaped html characters" );
});

test("jQuery('massive html #7990')", function() {
expect( 3 );

// Test very large html string #7990
var i;
var li = "<li>very large html string</li>";
var li = "<li>very very very very large html string</li>";
var html = ["<ul>"];
for ( i = 0; i < 50000; i += 1 ) {
html.push(li);
for ( i = 0; i < 30000; i += 1 ) {
html[html.length] = li;
}
html.push("</ul>");
html[html.length] = "</ul>";
html = jQuery(html.join(""))[0];
equal( html.nodeName.toUpperCase(), "UL");
equal( html.firstChild.nodeName.toUpperCase(), "LI");
equal( html.childNodes.length, 50000 );
equal( html.nodeName.toLowerCase(), "ul");
equal( html.firstChild.nodeName.toLowerCase(), "li");
equal( html.childNodes.length, 30000 );
});

test("jQuery('html', context)", function() {