X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=test%2Funit%2Fcore.js;h=3960a7df9b389909a1aa0c5983a2f80756ade04c;hb=1e9d6e1255f94a4643770bb498e875d4016c0781;hp=eccf544bf05f3cd8373f389c0a0c8a537772a1cc;hpb=141ad3c3e21e7734e67e37b5fb39782fe11b3c18;p=jquery.git
diff --git a/test/unit/core.js b/test/unit/core.js
index eccf544..3960a7d 100644
--- a/test/unit/core.js
+++ b/test/unit/core.js
@@ -258,21 +258,28 @@ test("isPlainObject", function() {
// Window
ok(!jQuery.isPlainObject(window), "window");
-
- var iframe = document.createElement("iframe");
- document.body.appendChild(iframe);
- window.iframeDone = function(otherObject){
- // Objects from other windows should be matched
- ok(jQuery.isPlainObject(new otherObject), "new otherObject");
+ try {
+ var iframe = document.createElement("iframe");
+ document.body.appendChild(iframe);
+
+ window.iframeDone = function(otherObject){
+ // Objects from other windows should be matched
+ ok(jQuery.isPlainObject(new otherObject), "new otherObject");
+ document.body.removeChild( iframe );
+ start();
+ };
+
+ var doc = iframe.contentDocument || iframe.contentWindow.document;
+ doc.open();
+ doc.write("");
+ doc.close();
+ } catch(e) {
document.body.removeChild( iframe );
+
+ ok(true, "new otherObject - iframes not supported");
start();
- };
-
- var doc = iframe.contentDocument || iframe.contentWindow.document;
- doc.open();
- doc.write("");
- doc.close();
+ }
});
test("isFunction", function() {
@@ -374,9 +381,15 @@ test("isXMLDoc - HTML", function() {
try {
var body = jQuery(iframe).contents()[0];
- ok( !jQuery.isXMLDoc( body ), "Iframe body element" );
- } catch(e){
- ok( false, "Iframe body element exception" );
+
+ try {
+ ok( !jQuery.isXMLDoc( body ), "Iframe body element" );
+ } catch(e) {
+ ok( false, "Iframe body element exception" );
+ }
+
+ } catch(e) {
+ ok( true, "Iframe body element - iframe not working correctly" );
}
document.body.removeChild( iframe );
@@ -398,7 +411,7 @@ test("isXMLDoc - XML", function() {
test("jQuery('html')", function() {
expect(15);
- reset();
+ QUnit.reset();
jQuery.foo = false;
var s = jQuery("")[0];
ok( s, "Creating a script" );
@@ -414,7 +427,7 @@ test("jQuery('html')", function() {
equals( div.childNodes[1].nodeType, 1, "Paragraph." );
equals( div.childNodes[1].firstChild.nodeType, 3, "Paragraph text." );
- reset();
+ QUnit.reset();
ok( jQuery("")[0], "Creating a link" );
ok( !jQuery("")[0].parentNode, "Create a script" );