diff options
Diffstat (limited to 'test')
32 files changed, 75 insertions, 174 deletions
diff --git a/test/csp.php b/test/csp.php deleted file mode 100644 index 9ab18f392..000000000 --- a/test/csp.php +++ /dev/null @@ -1,16 +0,0 @@ -<?php - header("X-Content-Security-Policy: default-src localhost 'self';"); - header("X-WebKit-CSP: script-src 'self'; style-src 'self' 'unsafe-inline'"); -?> -<!DOCTYPE html> -<html> -<head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <title>CSP Test Page</title> - - <script src="../dist/jquery.js"></script> -</head> -<body> - <p>CSP Test Page</p> -</body> -</html> diff --git a/test/data/ajax/unreleasedXHR.html b/test/data/ajax/unreleasedXHR.html index 6c3d8210b..5233354f5 100644 --- a/test/data/ajax/unreleasedXHR.html +++ b/test/data/ajax/unreleasedXHR.html @@ -3,7 +3,7 @@ <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 src="../../jquery.js"></script> <script type="text/javascript"> window.onunload = function() {}; jQuery(function() { diff --git a/test/data/core/cc_on.html b/test/data/core/cc_on.html index 88bb01029..131e2e853 100644 --- a/test/data/core/cc_on.html +++ b/test/data/core/cc_on.html @@ -12,7 +12,7 @@ errors.push( errorMessage ); }; </script> - <script src="../../../dist/jquery.min.js"></script> + <script src="../../jquery.js"></script> </head> <body> <script> diff --git a/test/data/dimensions/documentLarge.html b/test/data/dimensions/documentLarge.html index 2b5506c10..a6598fcc8 100644 --- a/test/data/dimensions/documentLarge.html +++ b/test/data/dimensions/documentLarge.html @@ -11,7 +11,7 @@ </head> <body> <div> - <script src="../../../dist/jquery.min.js"></script> + <script src="../../jquery.js"></script> </div> </body> </html> diff --git a/test/data/dimensions/documentSmall.html b/test/data/dimensions/documentSmall.html index 12cbf9385..63e1c2a8f 100644 --- a/test/data/dimensions/documentSmall.html +++ b/test/data/dimensions/documentSmall.html @@ -15,7 +15,7 @@ </head> <body> <div> - <script src="../../../dist/jquery.min.js"></script> + <script src="../../jquery.js"></script> </div> </body> </html> diff --git a/test/data/event/promiseReady.html b/test/data/event/promiseReady.html index d2b166f32..17b6e7f2c 100644 --- 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.min.js"></script> +<script src="../../jquery.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 6c2fc0e96..e0885707e 100644 --- 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.min.js"></script> +<script src="../../jquery.js"></script> </head> <body> diff --git a/test/data/manipulation/iframe-denied.html b/test/data/manipulation/iframe-denied.html index 28a530575..14df26a69 100644 --- 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.min.js"></script> + <script src="../../jquery.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 7c35ee3b7..7665d7aac 100644 --- 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.min.js"></script> + <script src="../../jquery.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 dd3193f91..6dc3d3754 100644 --- 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.min.js"></script> + <script src="../../jquery.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 1b35f5d35..7564f085e 100644 --- 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.min.js"></script> + <script src="../../jquery.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 91b6cbbc5..3ac054837 100644 --- 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.min.js"></script> + <script src="../../jquery.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 f8c638494..113400ce4 100644 --- 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.min.js"></script> + <script src="../../jquery.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 cf1a9a980..1e6ab7c4c 100644 --- 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.min.js"></script> + <script src="../../jquery.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 e8e431a8a..5510e2b9b 100644 --- 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.min.js"></script> + <script src="../../jquery.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 2124a6eb3..30f25c9d5 100644 --- 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.min.js"></script> + <script src="../../jquery.js"></script> <script id="script1" defer diff --git a/test/data/selector/sizzle_cache.html b/test/data/selector/sizzle_cache.html index 0c81b9826..1055c75ae 100644 --- a/test/data/selector/sizzle_cache.html +++ b/test/data/selector/sizzle_cache.html @@ -4,18 +4,18 @@ <meta http-equiv="Content-type" content="text/html; charset=utf-8"> <title>jQuery selector - sizzle cache</title> - <script src="../../../dist/jquery.js"></script> + <script src="../../jquery.js"></script> <script> - var $cached = jQuery.noConflict(true); + document.write( + "<script>var $cached = jQuery.noConflict(true);<\x2Fscript>" + + "<script src='" + document.getElementById("jquery-js").src + "?overwrite'><\x2Fscript>" + ); </script> - <script src="../../../dist/jquery.min.js"></script> </head> <body> - <div class="test"> <a href="#" id="collision">Worlds collide</a> </div> - </body> </html> diff --git a/test/data/support/bodyBackground.html b/test/data/support/bodyBackground.html index b0abc074f..8991007cf 100644 --- a/test/data/support/bodyBackground.html +++ b/test/data/support/bodyBackground.html @@ -17,7 +17,7 @@ </head> <body> <div> - <script src="../../../dist/jquery.min.js"></script> + <script src="../../jquery.js"></script> </div> <script> jQuery(function() { diff --git a/test/data/support/csp.js b/test/data/support/csp.js new file mode 100644 index 000000000..8bce34fd2 --- /dev/null +++ b/test/data/support/csp.js @@ -0,0 +1,3 @@ +jQuery(function() { + parent.iframeCallback( jQuery.support ); +}); diff --git a/test/data/support/csp.php b/test/data/support/csp.php new file mode 100644 index 000000000..f72aa0768 --- /dev/null +++ b/test/data/support/csp.php @@ -0,0 +1,22 @@ +<?php + # Support: Firefox + header("X-Content-Security-Policy: default-src 'self';"); + + # Support: Webkit, Safari 5 + # http://stackoverflow.com/questions/13663302/why-does-my-content-security-policy-work-everywhere-but-safari + header("X-WebKit-CSP: script-src " . $_SERVER["HTTP_HOST"] . " 'self'"); + + header("Content-Security-Policy: default-src 'self'"); +?> +<!DOCTYPE html> +<html> +<head> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + <title>CSP Test Page</title> + <script src="../../jquery.js"></script> + <script src="csp.js"></script> +</head> +<body> + <p>CSP Test Page</p> +</body> +</html> diff --git a/test/data/support/shrinkWrapBlocks.html b/test/data/support/shrinkWrapBlocks.html index 1ae15bfb5..a2097cb21 100644 --- a/test/data/support/shrinkWrapBlocks.html +++ b/test/data/support/shrinkWrapBlocks.html @@ -12,7 +12,7 @@ </head> <body> <div> - <script src="../../../dist/jquery.min.js"></script> + <script src="../../jquery.js"></script> </div> <script> jQuery(function() { diff --git a/test/data/support/testElementCrash.html b/test/data/support/testElementCrash.html index f5bc1b3dd..16de48ce1 100644 --- 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.min.js"></script> + <script src="../../jquery.js"></script> </head> <body> <script> diff --git a/test/delegatetest.html b/test/delegatetest.html index db773ef9e..119b63a73 100644 --- a/test/delegatetest.html +++ b/test/delegatetest.html @@ -2,7 +2,7 @@ <html> <head> <title>Event Delegation Tests</title> -<script src="../dist/jquery.min.js"></script> +<script src="jquery.js"></script> <style> table { border-collapse: collapse; diff --git a/test/hovertest.html b/test/hovertest.html index 151398fb1..8e45784c4 100644 --- a/test/hovertest.html +++ b/test/hovertest.html @@ -1,7 +1,7 @@ <html> <head> <title>Hover tests</title> -<script src="../dist/jquery.min.js"></script> +<script src="jquery.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 f073054d8..62ccfe12e 100644 --- a/test/index.html +++ b/test/index.html @@ -41,7 +41,7 @@ } // Load jQuery - document.write( "<script src='" + src + "'><\/script>" ); + document.write( "<script id='jquery-js' src='" + src + "'><\x2Fscript>" ); })(); </script> <script src="data/testrunner.js"></script> diff --git a/test/jquery.js b/test/jquery.js new file mode 100644 index 000000000..93d1095cd --- /dev/null +++ b/test/jquery.js @@ -0,0 +1,5 @@ +// Use the right jQuery source in iframe tests +document.write( "<script id='jquery-js' src='" + + parent.document.getElementById("jquery-js").src.replace( /^(?![^\/?#]+:)/, + parent.location.pathname.replace( /[^\/]$/, "$0/" ) ) + +"'><\x2Fscript>" ); diff --git a/test/localfile.html b/test/localfile.html index 8d3fb34a8..fbafe02cc 100644 --- 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.min.js"></script> + <script src="jquery.js"></script> <style> .error { color: red; } .success { color: green; } diff --git a/test/networkerror.html b/test/networkerror.html index 587786610..99b4ded51 100644 --- a/test/networkerror.html +++ b/test/networkerror.html @@ -15,7 +15,7 @@ <style> div { margin-top: 10px; } </style> - <script src="../dist/jquery.min.js"></script> + <script src="jquery.js"></script> <script type="text/javascript"> $('button').live('click', function () { $.ajax({ diff --git a/test/polluted.php b/test/polluted.php deleted file mode 100644 index 31a77c361..000000000 --- a/test/polluted.php +++ /dev/null @@ -1,110 +0,0 @@ -<?php - $baseURL = "http://ajax.googleapis.com/ajax/libs/"; - $libraries = array( - "Dojo" => array( - "versions" => array( "1.1.1", "1.2.0", "1.2.3", "1.3.0", "1.3.1", "1.3.2", "1.4.0", "1.4.1", "1.4.3", "1.5.0" ), - "url" => "dojo/XYZ/dojo/dojo.xd.js" - ), - "ExtCore" => array( - "versions" => array( "3.0.0", "3.1.0" ), - "url" => "ext-core/XYZ/ext-core.js" - ), - "jQuery" => array( - "versions" => array( "1.2.3", "1.2.6", "1.3.0", "1.3.1", "1.3.2", "1.4.0", "1.4.1", "1.4.2", "1.4.3", "1.4.4", "1.5.0" ), - "url" => "jquery/XYZ/jquery.min.js" - ), - "jQueryUI" => array( - "versions" => array( "1.5.2", "1.5.3", "1.6.0", "1.7.0", "1.7.1", "1.7.2", "1.7.3", "1.8.0", "1.8.1", "1.8.2", "1.8.4", "1.8.5", "1.8.6", "1.8.7", "1.8.8", "1.8.9" ), - "url" => "jqueryui/XYZ/jquery-ui.min.js" - ), - "MooTools" => array( - "versions" => array( "1.1.1", "1.1.2", "1.2.1", "1.2.2", "1.2.3", "1.2.4", "1.2.5", "1.3.0" ), - "url" => "mootools/XYZ/mootools-yui-compressed.js" - ), - "Prototype" => array( - "versions" => array( "1.6.0.2", "1.6.0.3", "1.6.1.0", "1.7.0.0" ), - "url" => "prototype/XYZ/prototype.js" - ), - "scriptaculous" => array( - "versions" => array( "1.8.1", "1.8.2", "1.8.3" ), - "url" => "scriptaculous/XYZ/scriptaculous.js" - ), - "SWFObject" => array( - "versions" => array( "2.1", "2.2" ), - "url" => "swfobject/XYZ/swfobject.js" - ), - "YUI" => array( - "versions" => array( "2.6.0", "2.7.0", "2.8.0r4", "2.8.1", "2.8.2", "3.3.0" ), - "url" => "yui/XYZ/build/yui/yui-min.js" - ) - ); - - if( count($_POST) ) { - $includes = array(); - foreach( $_POST as $name => $ver ){ - if ( empty( $libraries[ $name ] )) { - echo "unsupported library ". $name; - exit; - } - - $url = $libraries[ $name ][ "url" ]; - if( $name == "YUI" && $ver[0] == "2" ) { - $url = str_replace( "/yui", "/yuiloader", $url); - } - - if ( empty( $libraries[ $name ][ "versions" ][ $ver ] )) { - echo "library ". $name ." not supported in version ". $ver; - exit; - } - - $include = "<script src='$baseURL".str_replace("XYZ", $ver, $url)."'></script>\n"; - if( $lib == "prototype" ) { // prototype must be included first - array_unshift( $includes, $include ); - } else { - array_push( $includes, $include ); - } - } - - $includes = implode( "\n", $includes ); - $suite = file_get_contents( "index.html" ); - echo str_replace( "<!-- Includes -->", $includes, $suite ); - exit; - } -?> -<!DOCTYPE html> -<html> -<head> - <meta http-equiv="content-type" content="text/html; charset=UTF-8"> - <title>Run jQuery Test Suite Polluted</title> - <style type="text/css"> - .otherlibs fieldset { - width: 400px - } - .otherlibs label{ - margin: 5px 0px 5px 20px; - } - </style> -</head> - -<body id="body"> - <h1 id="header">jQuery Test Suite</h1> - <h2 id="banner" class="fail"></h2> - <h2 id="userAgent">Choose other libraries to include</h2> - - <form class="otherlibs" action="./polluted.php" method="POST"> - <?php - foreach( $libraries as $name => $data ) { - echo "<fieldset><legend>$name</legend>"; - $i = 0; - foreach( $data[ "versions" ] as $ver ) { - $i++; - echo "<label><input type='radio' name='$name' value='$ver' />$ver</label>"; - if( !($i % 4) ) echo "<br />"; - } - echo "</fieldset>"; - } - ?> - <input type="submit" value=" Run " class="submit" /> - </form> -</body> -</html> diff --git a/test/readywait.html b/test/readywait.html index 4738b1b95..7a736bef5 100644 --- 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.min.js"></script> + <script src="jquery.js"></script> <!-- Load the script loader that uses jQuery.readyWait --> diff --git a/test/unit/selector.js b/test/unit/selector.js index 07e563da3..22d7305eb 100644 --- a/test/unit/selector.js +++ b/test/unit/selector.js @@ -178,7 +178,8 @@ testIframe("selector/html5_selector", "attributes - jQuery.attr", function( jQue testIframe("selector/sizzle_cache", "Sizzle cache collides with multiple Sizzles on a page", function( jQuery, window, document ) { var $cached = window["$cached"]; - expect(3); + expect(4); + notStrictEqual( jQuery, $cached, "Loaded two engines" ); deepEqual( $cached(".test a").get(), [ document.getElementById("collision") ], "Select collision anchor with first sizzle" ); equal( jQuery(".evil a").length, 0, "Select nothing with second sizzle" ); equal( jQuery(".evil a").length, 0, "Select nothing again with second sizzle" ); diff --git a/test/unit/support.js b/test/unit/support.js index 60a658261..4c6a49d55 100644 --- a/test/unit/support.js +++ b/test/unit/support.js @@ -18,33 +18,18 @@ test( "zoom of doom (#13089)", function() { if ( jQuery.css ) { testIframeWithCallback( "body background is not lost if set prior to loading jQuery (#9239)", "support/bodyBackground.html", function( color, support ) { expect( 2 ); - var i, - passed = true, - okValue = { + var okValue = { "#000000": true, "rgb(0, 0, 0)": true }; ok( okValue[ color ], "color was not reset (" + color + ")" ); - for ( i in jQuery.support ) { - if ( jQuery.support[ i ] !== support[ i ] ) { - passed = false; - strictEqual( jQuery.support[ i ], support[ i ], "Support property " + i + " is different" ); - } - } - for ( i in support ) { - if ( !( i in jQuery.support ) ) { - passed = false; - strictEqual( jQuery.support[ i ], support[ i ], "Unexpected property: " + i ); - } - } - - ok( passed, "Same support properties" ); + deepEqual( jQuery.extend( {}, support ), jQuery.support, "Same support properties" ); }); } testIframeWithCallback( "A background on the testElement does not cause IE8 to crash (#9823)", "support/testElementCrash.html", function() { - expect(1); + expect( 1 ); ok( true, "IE8 does not crash" ); }); @@ -382,3 +367,14 @@ testIframeWithCallback( "box-sizing does not affect jQuery.support.shrinkWrapBlo } })(); + +// Support: Safari 5.1 +// Shameless browser-sniff, but Safari 5.1 mishandles CSP +if ( !( typeof navigator !== "undefined" && + (/ AppleWebKit\/\d.*? Version\/(\d+)/.exec(navigator.userAgent) || [])[1] < 6 ) ) { + + testIframeWithCallback( "Check CSP (https://developer.mozilla.org/en-US/docs/Security/CSP) restrictions", "support/csp.php", function( support ) { + expect( 1 ); + deepEqual( jQuery.extend( {}, support ), jQuery.support, "No violations of CSP polices" ); + }); +} |