Skip to content
Permalink
Browse files

Fix #13316. Use minified version in unit testing.

Also migrates the XHR check added to 2.0 in 62acda8.
  • Loading branch information...
dmethvin committed Jan 26, 2013
1 parent ac93559 commit a3055f3df63661ad1221db44d04ec92ece130a8c
@@ -0,0 +1,25 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>
<meta http-equiv="content-type" content="text/html; charset=utf-8">
<title>Attempt to block tests because of dangling XHR requests (IE)</title>
<script type="text/javascript" src="../../../dist/jquery.min.js"></script>
<script type="text/javascript">
window.onunload = function() {};
jQuery(function() {
setTimeout(function() {
var parent = window.parent;
document.write("");
parent.iframeCallback();
}, 200 );
var number = 50;
while( number-- ) {
jQuery.ajax("../name.php?wait=600");
}
});
</script>
</head>
<body>
<!-- empty body -->
</body>
</html>
@@ -11,7 +11,7 @@
</head>
<body>
<div>
<script src="../../../dist/jquery.js"></script>
<script src="../../../dist/jquery.min.js"></script>
</div>
</body>
</html>
@@ -15,7 +15,7 @@
</head>
<body>
<div>
<script src="../../../dist/jquery.js"></script>
<script src="../../../dist/jquery.min.js"></script>
</div>
</body>
</html>
@@ -3,7 +3,7 @@
<head>
<meta http-equiv="content-type" content="text/html; charset=utf-8">
<title>Test case for jQuery ticket #11470</title>
<script type="text/javascript" src="../../../dist/jquery.js"></script>
<script type="text/javascript" src="../../../dist/jquery.min.js"></script>
<script type="text/javascript">
jQuery.when( jQuery.ready ).done(function() {
jQuery("body").append("<div>modifying DOM</div>");
@@ -3,7 +3,7 @@
<head>
<meta http-equiv="content-type" content="text/html; charset=utf-8">
<title>Test case for jQuery ticket #10067</title>
<script type="text/javascript" src="../../../dist/jquery.js"></script>
<script type="text/javascript" src="../../../dist/jquery.min.js"></script>
</head>
<body>

@@ -6,7 +6,7 @@
</head>
<body>
<div id="qunit-fixture"></div>
<script src="../../../dist/jquery.js"></script>
<script src="../../../dist/jquery.min.js"></script>
<script>
var script = document.getElementsByTagName( "script" )[ 0 ],
div = document.createElement( "div" ),
@@ -15,7 +15,7 @@
p.instructions { position: absolute; bottom: 0; }
#positionTest { position: absolute; }
</style>
<script src="../../../dist/jquery.js"></script>
<script src="../../../dist/jquery.min.js"></script>
<script type="text/javascript" charset="utf-8">
jQuery(function($) {
$('.absolute').click(function() {
@@ -9,7 +9,7 @@
#marker { position: absolute; border: 2px solid #000; width: 50px; height: 50px; background: #ccc; }
#firstElement { width: 50px; height: 50px; background: green; }
</style>
<script src="../../../dist/jquery.js"></script>
<script src="../../../dist/jquery.min.js"></script>
<script type="text/javascript" charset="utf-8">
jQuery(function($) {
$('body').click(function() {
@@ -12,7 +12,7 @@
#forceScroll { width: 5000px; height: 5000px; }
#marker { position: absolute; border: 2px solid #000; width: 50px; height: 50px; background: #ccc; }
</style>
<script src="../../../dist/jquery.js"></script>
<script src="../../../dist/jquery.min.js"></script>
<script type="text/javascript" charset="utf-8">
jQuery(function($) {
window.scrollTo(1000,1000);
@@ -10,7 +10,7 @@
#relative-2 { top: 20px; left: 20px; }
#marker { position: absolute; border: 2px solid #000; width: 50px; height: 50px; background: #ccc; }
</style>
<script src="../../../dist/jquery.js"></script>
<script src="../../../dist/jquery.min.js"></script>
<script type="text/javascript" charset="utf-8">
jQuery(function($) {
$('.relative').click(function() {
@@ -13,7 +13,7 @@
#forceScroll { width: 5000px; height: 5000px; }
#marker { position: absolute; border: 2px solid #000; width: 50px; height: 50px; background: #ccc; }
</style>
<script src="../../../dist/jquery.js"></script>
<script src="../../../dist/jquery.min.js"></script>
<script type="text/javascript" charset="utf-8">
jQuery(function($) {
window.scrollTo(1000,1000);
@@ -10,7 +10,7 @@
#static-2 { top: 20px; left: 20px; }
#marker { position: absolute; border: 2px solid #000; width: 50px; height: 50px; background: #ccc; }
</style>
<script src="../../../dist/jquery.js"></script>
<script src="../../../dist/jquery.min.js"></script>
<script type="text/javascript" charset="utf-8">
jQuery(function($) {
$('.static').click(function() {
@@ -10,7 +10,7 @@
th, td { border: 1px solid #000; width: 100px; height: 100px; }
#marker { position: absolute; border: 2px solid #000; width: 50px; height: 50px; background: #ccc; }
</style>
<script src="../../../dist/jquery.js"></script>
<script src="../../../dist/jquery.min.js"></script>
<script type="text/javascript" charset="utf-8">
jQuery(function($) {
$('table, th, td').click(function() {
@@ -4,7 +4,7 @@
<meta http-equiv="Content-type" content="text/html; charset=utf-8">
<title>jQuery selector - attributes</title>

<script src="../../../dist/jquery.js"></script>
<script src="../../../dist/jquery.min.js"></script>

<script id="script1"
defer
@@ -8,7 +8,7 @@
<script>
var $cached = jQuery.noConflict(true);
</script>
<script src="../../../dist/jquery.js"></script>
<script src="../../../dist/jquery.min.js"></script>

</head>
<body>
@@ -17,7 +17,7 @@
</head>
<body>
<div>
<script src="../../../dist/jquery.js"></script>
<script src="../../../dist/jquery.min.js"></script>
</div>
<script>
jQuery(function() {
@@ -12,7 +12,7 @@
</head>
<body>
<div>
<script src="../../../dist/jquery.js"></script>
<script src="../../../dist/jquery.min.js"></script>
</div>
<script>
jQuery(function() {
@@ -7,7 +7,7 @@
background: url('../1x1.jpg');
}
</style>
<script src="../../../dist/jquery.js"></script>
<script src="../../../dist/jquery.min.js"></script>
</head>
<body>
<script>
@@ -2,7 +2,7 @@
<html>
<head>
<title>Event Delegation Tests</title>
<script src="../dist/jquery.js"></script>
<script src="../dist/jquery.min.js"></script>
<style>
table {
border-collapse: collapse;
@@ -1,7 +1,7 @@
<html>
<head>
<title>Hover tests</title>
<script src="../dist/jquery.js"></script>
<script src="../dist/jquery.min.js"></script>
<style>
/* Remove body dimensions so we can test enter/leave to surrounding browser chrome */
body, html {
@@ -16,16 +16,16 @@
<script src="qunit/qunit/qunit.js"></script>
<script>
(function() {
var src = "../dist/jquery.js";
var src = "../dist/jquery.min.js";
// Config parameter to use minified jQuery
QUnit.config.urlConfig.push({
id: "min",
label: "Load minified",
tooltip: "Load the minified version of the jQuery build"
id: "dev",
label: "Load unminified",
tooltip: "Load the development (unminified) jQuery file"
});
if ( QUnit.urlParams.min ) {
src = "../dist/jquery.min.js";
if ( QUnit.urlParams.dev ) {
src = "../dist/jquery.js";
}
// Config parameter to force basic code paths
@@ -4,7 +4,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>jQuery Local File Test</title>
<!-- Includes -->
<script src="../dist/jquery.js"></script>
<script src="../dist/jquery.min.js"></script>
<style>
.error { color: red; }
.success { color: green; }
@@ -15,7 +15,7 @@
<style>
div { margin-top: 10px; }
</style>
<script src="../dist/jquery.js"></script>
<script src="../dist/jquery.min.js"></script>
<script type="text/javascript">
$('button').live('click', function () {
$.ajax({
@@ -14,7 +14,7 @@
#output { background-color: green }
#expectedOutput { background-color: green }
</style>
<script src="../dist/jquery.js"></script>
<script src="../dist/jquery.min.js"></script>

<!-- Load the script loader that uses
jQuery.readyWait -->

0 comments on commit a3055f3

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