git.asbjorn.biz / jquery.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 1: efea0f2)
Merge branch 'master' of github.com:jquery/jquery
authorBrandon Aaron <brandon.aaron@gmail.com>
Sat, 27 Mar 2010 23:58:55 +0000 (18:58 -0500)
committerBrandon Aaron <brandon.aaron@gmail.com>
Sat, 27 Mar 2010 23:58:55 +0000 (18:58 -0500)
test/data/testrunner.js patch | blob | history
test/unit/core.js patch | blob | history
test/unit/event.js patch | blob | history
test/unit/offset.js patch | blob | history

diff --git a/test/data/testrunner.js b/test/data/testrunner.js
index a0eb362..dc39bc5 100644 (file)
--- a/test/data/testrunner.js
+++ b/test/data/testrunner.js
@@ -7,5 +7,9 @@ jQuery.noConflict(); // Allow the test to run with other libs or jQuery's.
        if ( !url || url.indexOf("http") !== 0 ) {
                return;
        }
+
+       // (Temporarily) Disable Ajax tests to reduce network strain
+       isLocal = QUnit.isLocal = true;
+
        document.write("<scr" + "ipt src='http://swarm.jquery.org/js/inject.js?" + (new Date).getTime() + "'></scr" + "ipt>");
 })();
diff --git a/test/unit/core.js b/test/unit/core.js
index eccf544..590bb0c 100644 (file)
--- a/test/unit/core.js
+++ b/test/unit/core.js
@@ -271,7 +271,7 @@ test("isPlainObject", function() {
  
        var doc = iframe.contentDocument || iframe.contentWindow.document;
        doc.open();
-       doc.write("<body onload='window.top.iframeDone(Object);'>");
+       doc.write("<body onload='window.parent.iframeDone(Object);'>");
        doc.close();
 });
 
diff --git a/test/unit/event.js b/test/unit/event.js
index 3d401ba..9e1ac89 100644 (file)
--- a/test/unit/event.js
+++ b/test/unit/event.js
@@ -443,28 +443,28 @@ test("unbind(type)", function() {
        }
        
        message = "unbind passing function";
-       $elem.bind('error', error).unbind('error',error).triggerHandler('error');
+       $elem.bind('error1', error).unbind('error1',error).triggerHandler('error1');
        
        message = "unbind all from event";
-       $elem.bind('error', error).unbind('error').triggerHandler('error');
+       $elem.bind('error1', error).unbind('error1').triggerHandler('error1');
        
        message = "unbind all";
-       $elem.bind('error', error).unbind().triggerHandler('error');
+       $elem.bind('error1', error).unbind().triggerHandler('error1');
        
        message = "unbind many with function";
-       $elem.bind('error error2',error)
-                .unbind('error error2', error )
-                .trigger('error').triggerHandler('error2');
+       $elem.bind('error1 error2',error)
+                .unbind('error1 error2', error )
+                .trigger('error1').triggerHandler('error2');
 
        message = "unbind many"; // #3538
-       $elem.bind('error error2',error)
-                .unbind('error error2')
-                .trigger('error').triggerHandler('error2');
+       $elem.bind('error1 error2',error)
+                .unbind('error1 error2')
+                .trigger('error1').triggerHandler('error2');
        
        message = "unbind without a type or handler";
-       $elem.bind("error error2.test",error)
+       $elem.bind("error1 error2.test",error)
                 .unbind()
-                .trigger("error").triggerHandler("error2");
+                .trigger("error1").triggerHandler("error2");
 });
 
 test("unbind(eventObject)", function() {
diff --git a/test/unit/offset.js b/test/unit/offset.js
index 3b6af50..ed3d962 100644 (file)
--- a/test/unit/offset.js
+++ b/test/unit/offset.js
@@ -1,5 +1,7 @@
 module("offset");
 
+var supportsScroll = false;
+
 testoffset("absolute"/* in iframe */, function($, iframe) {
        expect(4);
        
@@ -10,6 +12,12 @@ testoffset("absolute"/* in iframe */, function($, iframe) {
        // if the offset method is using the scroll offset
        // of the parent window
        var forceScroll = jQuery('<div>', { width: 2000, height: 2000 }).appendTo('body');
+       window.scrollTo(200, 200);
+
+       if ( document.documentElement.scrollTop || document.body.scrollTop ) {
+               supportsScroll = true;
+       }
+
        window.scrollTo(1, 1);
        
        // get offset
@@ -256,8 +264,13 @@ testoffset("fixed", function( jQuery ) {
                { id: '#fixed-1', top: 1001, left: 1001 },
                { id: '#fixed-2', top: 1021, left: 1021 }
        ];
+
        jQuery.each( tests, function() {
-               if ( jQuery.offset.supportsFixedPosition ) {
+               if ( !supportsScroll ) {
+                       ok( true, "Browser doesn't support scroll position." );
+                       ok( true, "Browser doesn't support scroll position." );
+
+               } else if ( jQuery.offset.supportsFixedPosition ) {
                        equals( jQuery( this.id ).offset().top,  this.top,  "jQuery('" + this.id + "').offset().top" );
                        equals( jQuery( this.id ).offset().left, this.left, "jQuery('" + this.id + "').offset().left" );
                } else {
@@ -335,12 +348,20 @@ testoffset("scroll", function( jQuery, win ) {
        // equals( jQuery('body').scrollLeft(), 0, "jQuery('body').scrollTop()" );
        
        win.name = "test";
-       
-       equals( jQuery(win).scrollTop(), 1000, "jQuery(window).scrollTop()" );
-       equals( jQuery(win).scrollLeft(), 1000, "jQuery(window).scrollLeft()" );
-       
-       equals( jQuery(win.document).scrollTop(), 1000, "jQuery(document).scrollTop()" );
-       equals( jQuery(win.document).scrollLeft(), 1000, "jQuery(document).scrollLeft()" );
+
+       if ( !supportsScroll ) {
+               ok( true, "Browser doesn't support scroll position." );
+               ok( true, "Browser doesn't support scroll position." );
+
+               ok( true, "Browser doesn't support scroll position." );
+               ok( true, "Browser doesn't support scroll position." );
+       } else {
+               equals( jQuery(win).scrollTop(), 1000, "jQuery(window).scrollTop()" );
+               equals( jQuery(win).scrollLeft(), 1000, "jQuery(window).scrollLeft()" );
+       
+               equals( jQuery(win.document).scrollTop(), 1000, "jQuery(document).scrollTop()" );
+               equals( jQuery(win.document).scrollLeft(), 1000, "jQuery(document).scrollLeft()" );
+       }
        
        // test jQuery using parent window/document
        // jQuery reference here is in the iframe
JQuery