aboutsummaryrefslogtreecommitdiffstats
path: root/test/unit
diff options
context:
space:
mode:
authorRick Waldron <waldron.rick@gmail.com>2012-06-06 18:13:59 -0400
committerRick Waldron <waldron.rick@gmail.com>2012-06-06 18:13:59 -0400
commit5d25f78291c11ca26ce70281ee4ac81d1e3d8dd4 (patch)
tree19b2c99e7d330fb2af02d7f7f023609df20917d4 /test/unit
parent53a5810bfc7251b9fcb7d0f9fb56853fdceb0273 (diff)
downloadjquery-5d25f78291c11ca26ce70281ee4ac81d1e3d8dd4.tar.gz
jquery-5d25f78291c11ca26ce70281ee4ac81d1e3d8dd4.zip
Conditionally run height/width in iframeTest
Diffstat (limited to 'test/unit')
-rw-r--r--test/unit/dimensions.js9
1 files changed, 7 insertions, 2 deletions
diff --git a/test/unit/dimensions.js b/test/unit/dimensions.js
index 04411c319..4a9dd0b42 100644
--- a/test/unit/dimensions.js
+++ b/test/unit/dimensions.js
@@ -430,8 +430,13 @@ testIframe( "dimensions/documentSmall", "window vs. small document", function( j
testIframe( "dimensions/documentLarge", "window vs. large document", function( jQuery, window, document ) {
expect(2);
- ok( jQuery( document ).height() > jQuery( window ).height(), "document height is larger than window height" );
- ok( jQuery( document ).width() > jQuery( window ).width(), "document width is larger than window width" );
+ if ( jQuery.fn.height && jQuery.fn. width ) {
+ expect(2);
+ ok( jQuery( document ).height() > jQuery( window ).height(), "document height is larger than window height" );
+ ok( jQuery( document ).width() > jQuery( window ).width(), "document width is larger than window width" );
+ } else {
+ expect(0);
+ }
});
}