diff options
author | jaubourg <j@ubourg.net> | 2011-05-10 12:23:53 +0200 |
---|---|---|
committer | jaubourg <j@ubourg.net> | 2011-05-10 12:24:36 +0200 |
commit | 38de389a8e675c0c2d1172dd23339325ae82539a (patch) | |
tree | 6bdfa2330e03edb71ebfbf34b0e01cd2f64cb2bb /test | |
parent | 4526c8b0a05ea16397a0640875bfbb54645a9482 (diff) | |
download | jquery-38de389a8e675c0c2d1172dd23339325ae82539a.tar.gz jquery-38de389a8e675c0c2d1172dd23339325ae82539a.zip |
Adds unit/support.js to unit tests. Still have to test for #8763 has to be done in its own file however, since Firefox refuses to notify global errors in the iframe (attachEvent, window.onerror and script.onerror all fail).
Diffstat (limited to 'test')
-rw-r--r-- | test/boxModelIE.html | 33 | ||||
-rw-r--r-- | test/data/support/boxModelIE.html | 27 | ||||
-rw-r--r-- | test/data/support/hiddenIFrameFF.html | 25 | ||||
-rw-r--r-- | test/index.html | 1 | ||||
-rw-r--r-- | test/unit/support.js | 32 |
5 files changed, 85 insertions, 33 deletions
diff --git a/test/boxModelIE.html b/test/boxModelIE.html deleted file mode 100644 index f8e6a431e..000000000 --- a/test/boxModelIE.html +++ /dev/null @@ -1,33 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> -<html> -<body> - <h3>jQuery Test boxModel detection in IE 6 & 7 compatMode="CSS1Compat"</h3> - <div>document.compatMode = <span id="compat-mode">?</span></div> - <div>jQuery.support.boxModel = <span id="box-model">?</span></div> - <script src="../src/core.js"></script> - <script src="../src/deferred.js"></script> - <script src="../src/support.js"></script> - <script src="../src/data.js"></script> - <script src="../src/queue.js"></script> - <script src="../src/attributes.js"></script> - <script src="../src/event.js"></script> - <script src="../src/sizzle/sizzle.js"></script> - <script src="../src/sizzle-jquery.js"></script> - <script src="../src/traversing.js"></script> - <script src="../src/manipulation.js"></script> - <script src="../src/css.js"></script> - <script src="../src/ajax.js"></script> - <script src="../src/ajax/jsonp.js"></script> - <script src="../src/ajax/script.js"></script> - <script src="../src/ajax/xhr.js"></script> - <script src="../src/effects.js"></script> - <script src="../src/offset.js"></script> - <script src="../src/dimensions.js"></script> - <script> - jQuery(function() { - jQuery( "#compat-mode" ).text( document.compatMode ); - jQuery( "#box-model" ).text( jQuery.support.boxModel ); - }); - </script> -</body> -</html>
\ No newline at end of file diff --git a/test/data/support/boxModelIE.html b/test/data/support/boxModelIE.html new file mode 100644 index 000000000..1b11d2a59 --- /dev/null +++ b/test/data/support/boxModelIE.html @@ -0,0 +1,27 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> +<html> +<body> + <script src="../../../src/core.js"></script> + <script src="../../../src/deferred.js"></script> + <script src="../../../src/support.js"></script> + <script src="../../../src/data.js"></script> + <script src="../../../src/queue.js"></script> + <script src="../../../src/attributes.js"></script> + <script src="../../../src/event.js"></script> + <script src="../../../src/sizzle/sizzle.js"></script> + <script src="../../../src/sizzle-jquery.js"></script> + <script src="../../../src/traversing.js"></script> + <script src="../../../src/manipulation.js"></script> + <script src="../../../src/css.js"></script> + <script src="../../../src/ajax.js"></script> + <script src="../../../src/ajax/jsonp.js"></script> + <script src="../../../src/ajax/script.js"></script> + <script src="../../../src/ajax/xhr.js"></script> + <script src="../../../src/effects.js"></script> + <script src="../../../src/offset.js"></script> + <script src="../../../src/dimensions.js"></script> + <script> + window.top.supportCallback( document.compatMode, jQuery.support.boxModel ); + </script> +</body> +</html> diff --git a/test/data/support/hiddenIFrameFF.html b/test/data/support/hiddenIFrameFF.html new file mode 100644 index 000000000..000ac851a --- /dev/null +++ b/test/data/support/hiddenIFrameFF.html @@ -0,0 +1,25 @@ +<html> + <head> + <script src="../../../src/core.js"></script> + <script src="../../../src/deferred.js"></script> + <script src="../../../src/support.js"></script> + <script src="../../../src/data.js"></script> + <script src="../../../src/queue.js"></script> + <script src="../../../src/attributes.js"></script> + <script src="../../../src/event.js"></script> + <script src="../../../src/sizzle/sizzle.js"></script> + <script src="../../../src/sizzle-jquery.js"></script> + <script src="../../../src/traversing.js"></script> + <script src="../../../src/manipulation.js"></script> + <script src="../../../src/css.js"></script> + <script src="../../../src/ajax.js"></script> + <script src="../../../src/ajax/jsonp.js"></script> + <script src="../../../src/ajax/script.js"></script> + <script src="../../../src/ajax/xhr.js"></script> + <script src="../../../src/effects.js"></script> + <script src="../../../src/offset.js"></script> + <script src="../../../src/dimensions.js"></script> + </head> + <body> + </body> +</html> diff --git a/test/index.html b/test/index.html index 3d421a565..4b4c98552 100644 --- a/test/index.html +++ b/test/index.html @@ -34,6 +34,7 @@ <script src="data/testrunner.js"></script> <script src="unit/core.js"></script> + <script src="unit/support.js"></script> <script src="unit/deferred.js"></script> <script src="unit/data.js"></script> <script src="unit/queue.js"></script> diff --git a/test/unit/support.js b/test/unit/support.js new file mode 100644 index 000000000..9d99529a1 --- /dev/null +++ b/test/unit/support.js @@ -0,0 +1,32 @@ +module("support", { teardown: moduleTeardown }); + +function supportIFrameTest( title, url, noDisplay, func ) { + + if ( noDisplay !== true ) { + func = noDisplay; + noDisplay = false; + } + + test( title, function() { + var iframe; + + stop(); + window.supportCallback = function() { + var self = this, + args = arguments; + setTimeout( function() { + window.supportCallback = undefined; + iframe.remove(); + func.apply( self, args ); + start(); + }, 0 ); + }; + iframe = jQuery( "<div/>" ).css( "display", noDisplay ? "none" : "block" ).append( + jQuery( "<iframe/>" ).attr( "src", "data/support/" + url + ".html" ) + ).appendTo( "body" ); + }); +} + +supportIFrameTest( "proper boxModel in compatMode CSS1Compat (IE6 and IE7)", "boxModelIE", function( compatMode, boxModel ) { + ok( compatMode !== "CSS1Compat" || boxModel, "boxModel properly detected" ); +}); |