]> source.dussan.org Git - jquery.git/commitdiff
projects / jquery.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ac93559)
Fix #13316. Use minified version in unit testing.
authorDave Methvin <dave.methvin@gmail.com>
Sat, 26 Jan 2013 15:48:10 +0000 (10:48 -0500)
committerDave Methvin <dave.methvin@gmail.com>
Sat, 26 Jan 2013 15:52:19 +0000 (10:52 -0500)
Also migrates the XHR check added to 2.0 in 62acda819f9b6fba9263d0b613e15285807b23a7.

24 files changed:
test/data/ajax/unreleasedXHR.html [new file with mode: 0644] patch | blob
test/data/dimensions/documentLarge.html patch | blob | history
test/data/dimensions/documentSmall.html patch | blob | history
test/data/event/promiseReady.html patch | blob | history
test/data/event/syncReady.html patch | blob | history
test/data/manipulation/iframe-denied.html patch | blob | history
test/data/offset/absolute.html patch | blob | history
test/data/offset/body.html patch | blob | history
test/data/offset/fixed.html patch | blob | history
test/data/offset/relative.html patch | blob | history
test/data/offset/scroll.html patch | blob | history
test/data/offset/static.html patch | blob | history
test/data/offset/table.html patch | blob | history
test/data/selector/html5_selector.html patch | blob | history
test/data/selector/sizzle_cache.html patch | blob | history
test/data/support/bodyBackground.html patch | blob | history
test/data/support/shrinkWrapBlocks.html patch | blob | history
test/data/support/testElementCrash.html patch | blob | history
test/delegatetest.html patch | blob | history
test/hovertest.html patch | blob | history
test/index.html patch | blob | history
test/localfile.html patch | blob | history
test/networkerror.html patch | blob | history
test/readywait.html patch | blob | history

diff --git a/test/data/ajax/unreleasedXHR.html b/test/data/ajax/unreleasedXHR.html
new file mode 100644 (file)
index 0000000..6c3d821
--- /dev/null
+++ b/test/data/ajax/unreleasedXHR.html
@@ -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>
diff --git a/test/data/dimensions/documentLarge.html b/test/data/dimensions/documentLarge.html
index b2fabd144db14457bd654f356dc2a3966d87e551..2b5506c10e899104ce8056f46957205969938607 100644 (file)
--- a/test/data/dimensions/documentLarge.html
+++ b/test/data/dimensions/documentLarge.html
@@ -11,7 +11,7 @@
 </head>
 <body>
        <div>
-               <script src="../../../dist/jquery.js"></script>
+               <script src="../../../dist/jquery.min.js"></script>
        </div>
 </body>
 </html>
diff --git a/test/data/dimensions/documentSmall.html b/test/data/dimensions/documentSmall.html
index d5eeacfc2e868901ef1b1f4297a452ef436a2ca6..12cbf93855953c4ac4684c03fe958fb4a5f37f21 100644 (file)
--- a/test/data/dimensions/documentSmall.html
+++ b/test/data/dimensions/documentSmall.html
@@ -15,7 +15,7 @@
 </head>
 <body>
        <div>
-               <script src="../../../dist/jquery.js"></script>
+               <script src="../../../dist/jquery.min.js"></script>
        </div>
 </body>
 </html>
diff --git a/test/data/event/promiseReady.html b/test/data/event/promiseReady.html
index 3ea11f05eacd0a335ce113c1bb1389cae42715c2..d2b166f32201f8aadc9ee1172a4c1da1e6a8b379 100644 (file)
--- a/test/data/event/promiseReady.html
+++ b/test/data/event/promiseReady.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>");
diff --git a/test/data/event/syncReady.html b/test/data/event/syncReady.html
index 126e2d57f4570be9ae9481a6e2118bcf675c06c1..6c2fc0e96bb9e7f283fed520579adc8748726455 100644 (file)
--- a/test/data/event/syncReady.html
+++ b/test/data/event/syncReady.html
@@ -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>
 
diff --git a/test/data/manipulation/iframe-denied.html b/test/data/manipulation/iframe-denied.html
index da205ff49a3565a590cdcd5cf39ac8cf8c0a2ce7..28a53057594423d0e39384f99f3b4f75a5ed1d28 100644 (file)
--- a/test/data/manipulation/iframe-denied.html
+++ b/test/data/manipulation/iframe-denied.html
@@ -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" ),
diff --git a/test/data/offset/absolute.html b/test/data/offset/absolute.html
index 78db1a3785bc49f91de3dea84157a2c00294398e..7c35ee3b74ca1b17e8ed138258ec0343b50f30ec 100644 (file)
--- a/test/data/offset/absolute.html
+++ b/test/data/offset/absolute.html
@@ -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() {
diff --git a/test/data/offset/body.html b/test/data/offset/body.html
index c5d7e66d751bb79ff10b5e45315356e242796e6e..dd3193f9170a4df0b6da0d8e25e0932bbb15afb5 100644 (file)
--- a/test/data/offset/body.html
+++ b/test/data/offset/body.html
@@ -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() {
diff --git a/test/data/offset/fixed.html b/test/data/offset/fixed.html
index 6fa2af992eab2de434c45c15dace18047a6c2592..1b35f5d358d8a1fd83157cb585a490a898232718 100644 (file)
--- a/test/data/offset/fixed.html
+++ b/test/data/offset/fixed.html
@@ -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);
diff --git a/test/data/offset/relative.html b/test/data/offset/relative.html
index 33b6abb6d067849294356d5acbe193cd6758e344..91b6cbbc5bd530f9898bf976aec5b7516d0f86f3 100644 (file)
--- a/test/data/offset/relative.html
+++ b/test/data/offset/relative.html
@@ -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() {
diff --git a/test/data/offset/scroll.html b/test/data/offset/scroll.html
index 716891c868f0dc355528acb5f2dc8356ec93f2bf..f8c638494cb3c8aab6073b87aa6d45c42530ab27 100644 (file)
--- a/test/data/offset/scroll.html
+++ b/test/data/offset/scroll.html
@@ -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);
diff --git a/test/data/offset/static.html b/test/data/offset/static.html
index 674a7d03aac29108b6f0065bbbc62b63c06c0525..cf1a9a9807b4ce5e5fd32de3881ef6944002af2e 100644 (file)
--- a/test/data/offset/static.html
+++ b/test/data/offset/static.html
@@ -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() {
diff --git a/test/data/offset/table.html b/test/data/offset/table.html
index 004f4acb0f3c7667804b1bc561a3071a115538a0..e8e431a8a7ce23493a93a62c82d2e6b02c9075dd 100644 (file)
--- a/test/data/offset/table.html
+++ b/test/data/offset/table.html
@@ -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() {
diff --git a/test/data/selector/html5_selector.html b/test/data/selector/html5_selector.html
index c62328903add2785533d9c58579ec886d0a0bdb3..2124a6eb3bdd4cfa47db28c167795e74d33428c4 100644 (file)
--- a/test/data/selector/html5_selector.html
+++ b/test/data/selector/html5_selector.html
@@ -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
diff --git a/test/data/selector/sizzle_cache.html b/test/data/selector/sizzle_cache.html
index 5b8bbb485b990062a192724c5cb9cb5d0162f9f9..0c81b98262d7e2daf5b2bc8d0ccc9f17a77f3e2e 100644 (file)
--- a/test/data/selector/sizzle_cache.html
+++ b/test/data/selector/sizzle_cache.html
@@ -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>
diff --git a/test/data/support/bodyBackground.html b/test/data/support/bodyBackground.html
index ebfa341c4ba75be029941e2e6911501b787a7861..b0abc074fe2c4c32bd27a19e9d2a34e432e12435 100644 (file)
--- a/test/data/support/bodyBackground.html
+++ b/test/data/support/bodyBackground.html
@@ -17,7 +17,7 @@
 </head>
 <body>
        <div>
-               <script src="../../../dist/jquery.js"></script>
+               <script src="../../../dist/jquery.min.js"></script>
        </div>
        <script>
                jQuery(function() {
diff --git a/test/data/support/shrinkWrapBlocks.html b/test/data/support/shrinkWrapBlocks.html
index af1493937fbb53be65ba9217865f25225cfa42d0..1ae15bfb5677375b5d2607490be03a4ae8813a5f 100644 (file)
--- a/test/data/support/shrinkWrapBlocks.html
+++ b/test/data/support/shrinkWrapBlocks.html
@@ -12,7 +12,7 @@
 </head>
 <body>
        <div>
-               <script src="../../../dist/jquery.js"></script>
+               <script src="../../../dist/jquery.min.js"></script>
        </div>
        <script>
                jQuery(function() {
diff --git a/test/data/support/testElementCrash.html b/test/data/support/testElementCrash.html
index 315a5ddd0893b1bcd2b85797e9db4bffdceeba1e..f5bc1b3ddde0e78f9e4788b9c693cdebaa7d71de 100644 (file)
--- a/test/data/support/testElementCrash.html
+++ b/test/data/support/testElementCrash.html
@@ -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>
diff --git a/test/delegatetest.html b/test/delegatetest.html
index 9c3718b1924764669de7c3eede02cca3cf9f2292..db773ef9e1f9fa591e8e14129b4996245ae687f8 100644 (file)
--- a/test/delegatetest.html
+++ b/test/delegatetest.html
@@ -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;
diff --git a/test/hovertest.html b/test/hovertest.html
index 2f85d5e62bdb8348fb4ce53337e324f66c89dd97..151398fb18a40d6349d7e8a8d37605a2dd7f025c 100644 (file)
--- a/test/hovertest.html
+++ b/test/hovertest.html
@@ -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 {
diff --git a/test/index.html b/test/index.html
index 9f8edfe2028cbce570d8f3b60fa7a80eecb44d17..cedbb8282140018b5a02427ca5327883a4cae285 100644 (file)
--- a/test/index.html
+++ b/test/index.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
diff --git a/test/localfile.html b/test/localfile.html
index 7d49c44e1bb92c9ddeb36aba78d2dc96d313c2e9..8d3fb34a80513f7af0b23fc03f2ce3f09cd0ba65 100644 (file)
--- a/test/localfile.html
+++ b/test/localfile.html
@@ -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; }
diff --git a/test/networkerror.html b/test/networkerror.html
index 0c6b61f152856252704a0ae184091bcf44df476f..587786610419787f61a675337219b551383f27fa 100644 (file)
--- a/test/networkerror.html
+++ b/test/networkerror.html
@@ -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({
diff --git a/test/readywait.html b/test/readywait.html
index 9983be432272a841ca2e361be10b3d9f8c813f01..4738b1b9529a6ddff9b9ea7ee3183c185bf13029 100644 (file)
--- a/test/readywait.html
+++ b/test/readywait.html
@@ -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 -->
jQuery JavaScript Library: https://github.com/jquery/jquery