Commit a3055f3d authored by Dave Methvin's avatar Dave Methvin

Fix #13316. Use minified version in unit testing.

Also migrates the XHR check added to 2.0 in 62acda81.
parent ac93559e
<!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 @@ ...@@ -11,7 +11,7 @@
</head> </head>
<body> <body>
<div> <div>
<script src="../../../dist/jquery.js"></script> <script src="../../../dist/jquery.min.js"></script>
</div> </div>
</body> </body>
</html> </html>
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
</head> </head>
<body> <body>
<div> <div>
<script src="../../../dist/jquery.js"></script> <script src="../../../dist/jquery.min.js"></script>
</div> </div>
</body> </body>
</html> </html>
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<head> <head>
<meta http-equiv="content-type" content="text/html; charset=utf-8"> <meta http-equiv="content-type" content="text/html; charset=utf-8">
<title>Test case for jQuery ticket #11470</title> <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"> <script type="text/javascript">
jQuery.when( jQuery.ready ).done(function() { jQuery.when( jQuery.ready ).done(function() {
jQuery("body").append("<div>modifying DOM</div>"); jQuery("body").append("<div>modifying DOM</div>");
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<head> <head>
<meta http-equiv="content-type" content="text/html; charset=utf-8"> <meta http-equiv="content-type" content="text/html; charset=utf-8">
<title>Test case for jQuery ticket #10067</title> <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> </head>
<body> <body>
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
</head> </head>
<body> <body>
<div id="qunit-fixture"></div> <div id="qunit-fixture"></div>
<script src="../../../dist/jquery.js"></script> <script src="../../../dist/jquery.min.js"></script>
<script> <script>
var script = document.getElementsByTagName( "script" )[ 0 ], var script = document.getElementsByTagName( "script" )[ 0 ],
div = document.createElement( "div" ), div = document.createElement( "div" ),
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
p.instructions { position: absolute; bottom: 0; } p.instructions { position: absolute; bottom: 0; }
#positionTest { position: absolute; } #positionTest { position: absolute; }
</style> </style>
<script src="../../../dist/jquery.js"></script> <script src="../../../dist/jquery.min.js"></script>
<script type="text/javascript" charset="utf-8"> <script type="text/javascript" charset="utf-8">
jQuery(function($) { jQuery(function($) {
$('.absolute').click(function() { $('.absolute').click(function() {
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
#marker { position: absolute; border: 2px solid #000; width: 50px; height: 50px; background: #ccc; } #marker { position: absolute; border: 2px solid #000; width: 50px; height: 50px; background: #ccc; }
#firstElement { width: 50px; height: 50px; background: green; } #firstElement { width: 50px; height: 50px; background: green; }
</style> </style>
<script src="../../../dist/jquery.js"></script> <script src="../../../dist/jquery.min.js"></script>
<script type="text/javascript" charset="utf-8"> <script type="text/javascript" charset="utf-8">
jQuery(function($) { jQuery(function($) {
$('body').click(function() { $('body').click(function() {
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
#forceScroll { width: 5000px; height: 5000px; } #forceScroll { width: 5000px; height: 5000px; }
#marker { position: absolute; border: 2px solid #000; width: 50px; height: 50px; background: #ccc; } #marker { position: absolute; border: 2px solid #000; width: 50px; height: 50px; background: #ccc; }
</style> </style>
<script src="../../../dist/jquery.js"></script> <script src="../../../dist/jquery.min.js"></script>
<script type="text/javascript" charset="utf-8"> <script type="text/javascript" charset="utf-8">
jQuery(function($) { jQuery(function($) {
window.scrollTo(1000,1000); window.scrollTo(1000,1000);
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
#relative-2 { top: 20px; left: 20px; } #relative-2 { top: 20px; left: 20px; }
#marker { position: absolute; border: 2px solid #000; width: 50px; height: 50px; background: #ccc; } #marker { position: absolute; border: 2px solid #000; width: 50px; height: 50px; background: #ccc; }
</style> </style>
<script src="../../../dist/jquery.js"></script> <script src="../../../dist/jquery.min.js"></script>
<script type="text/javascript" charset="utf-8"> <script type="text/javascript" charset="utf-8">
jQuery(function($) { jQuery(function($) {
$('.relative').click(function() { $('.relative').click(function() {
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
#forceScroll { width: 5000px; height: 5000px; } #forceScroll { width: 5000px; height: 5000px; }
#marker { position: absolute; border: 2px solid #000; width: 50px; height: 50px; background: #ccc; } #marker { position: absolute; border: 2px solid #000; width: 50px; height: 50px; background: #ccc; }
</style> </style>
<script src="../../../dist/jquery.js"></script> <script src="../../../dist/jquery.min.js"></script>
<script type="text/javascript" charset="utf-8"> <script type="text/javascript" charset="utf-8">
jQuery(function($) { jQuery(function($) {
window.scrollTo(1000,1000); window.scrollTo(1000,1000);
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
#static-2 { top: 20px; left: 20px; } #static-2 { top: 20px; left: 20px; }
#marker { position: absolute; border: 2px solid #000; width: 50px; height: 50px; background: #ccc; } #marker { position: absolute; border: 2px solid #000; width: 50px; height: 50px; background: #ccc; }
</style> </style>
<script src="../../../dist/jquery.js"></script> <script src="../../../dist/jquery.min.js"></script>
<script type="text/javascript" charset="utf-8"> <script type="text/javascript" charset="utf-8">
jQuery(function($) { jQuery(function($) {
$('.static').click(function() { $('.static').click(function() {
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
th, td { border: 1px solid #000; width: 100px; height: 100px; } th, td { border: 1px solid #000; width: 100px; height: 100px; }
#marker { position: absolute; border: 2px solid #000; width: 50px; height: 50px; background: #ccc; } #marker { position: absolute; border: 2px solid #000; width: 50px; height: 50px; background: #ccc; }
</style> </style>
<script src="../../../dist/jquery.js"></script> <script src="../../../dist/jquery.min.js"></script>
<script type="text/javascript" charset="utf-8"> <script type="text/javascript" charset="utf-8">
jQuery(function($) { jQuery(function($) {
$('table, th, td').click(function() { $('table, th, td').click(function() {
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<meta http-equiv="Content-type" content="text/html; charset=utf-8"> <meta http-equiv="Content-type" content="text/html; charset=utf-8">
<title>jQuery selector - attributes</title> <title>jQuery selector - attributes</title>
<script src="../../../dist/jquery.js"></script> <script src="../../../dist/jquery.min.js"></script>
<script id="script1" <script id="script1"
defer defer
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<script> <script>
var $cached = jQuery.noConflict(true); var $cached = jQuery.noConflict(true);
</script> </script>
<script src="../../../dist/jquery.js"></script> <script src="../../../dist/jquery.min.js"></script>
</head> </head>
<body> <body>
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
</head> </head>
<body> <body>
<div> <div>
<script src="../../../dist/jquery.js"></script> <script src="../../../dist/jquery.min.js"></script>
</div> </div>
<script> <script>
jQuery(function() { jQuery(function() {
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
</head> </head>
<body> <body>
<div> <div>
<script src="../../../dist/jquery.js"></script> <script src="../../../dist/jquery.min.js"></script>
</div> </div>
<script> <script>
jQuery(function() { jQuery(function() {
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
background: url('../1x1.jpg'); background: url('../1x1.jpg');
} }
</style> </style>
<script src="../../../dist/jquery.js"></script> <script src="../../../dist/jquery.min.js"></script>
</head> </head>
<body> <body>
<script> <script>
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<html> <html>
<head> <head>
<title>Event Delegation Tests</title> <title>Event Delegation Tests</title>
<script src="../dist/jquery.js"></script> <script src="../dist/jquery.min.js"></script>
<style> <style>
table { table {
border-collapse: collapse; border-collapse: collapse;
......
<html> <html>
<head> <head>
<title>Hover tests</title> <title>Hover tests</title>
<script src="../dist/jquery.js"></script> <script src="../dist/jquery.min.js"></script>
<style> <style>
/* Remove body dimensions so we can test enter/leave to surrounding browser chrome */ /* Remove body dimensions so we can test enter/leave to surrounding browser chrome */
body, html { body, html {
......
...@@ -16,16 +16,16 @@ ...@@ -16,16 +16,16 @@
<script src="qunit/qunit/qunit.js"></script> <script src="qunit/qunit/qunit.js"></script>
<script> <script>
(function() { (function() {
var src = "../dist/jquery.js"; var src = "../dist/jquery.min.js";
// Config parameter to use minified jQuery // Config parameter to use minified jQuery
QUnit.config.urlConfig.push({ QUnit.config.urlConfig.push({
id: "min", id: "dev",
label: "Load minified", label: "Load unminified",
tooltip: "Load the minified version of the jQuery build" tooltip: "Load the development (unminified) jQuery file"
}); });
if ( QUnit.urlParams.min ) { if ( QUnit.urlParams.dev ) {
src = "../dist/jquery.min.js"; src = "../dist/jquery.js";
} }
// Config parameter to force basic code paths // Config parameter to force basic code paths
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>jQuery Local File Test</title> <title>jQuery Local File Test</title>
<!-- Includes --> <!-- Includes -->
<script src="../dist/jquery.js"></script> <script src="../dist/jquery.min.js"></script>
<style> <style>
.error { color: red; } .error { color: red; }
.success { color: green; } .success { color: green; }
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<style> <style>
div { margin-top: 10px; } div { margin-top: 10px; }
</style> </style>
<script src="../dist/jquery.js"></script> <script src="../dist/jquery.min.js"></script>
<script type="text/javascript"> <script type="text/javascript">
$('button').live('click', function () { $('button').live('click', function () {
$.ajax({ $.ajax({
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
#output { background-color: green } #output { background-color: green }
#expectedOutput { background-color: green } #expectedOutput { background-color: green }
</style> </style>
<script src="../dist/jquery.js"></script> <script src="../dist/jquery.min.js"></script>
<!-- Load the script loader that uses <!-- Load the script loader that uses
jQuery.readyWait --> jQuery.readyWait -->
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment