X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;ds=sidebyside;f=test%2Funit%2Ffx.js;h=28fb92d2f083297ff70bf78d171f80c1b26d11e4;hb=c0294278db40da764a98ea1c1506548e539213c7;hp=c20e39ceb83da807019ec58b4a5434b15899ad72;hpb=e2ef3df86d5f54274bf2b779d882c30aa0886bfe;p=jquery.git
diff --git a/test/unit/fx.js b/test/unit/fx.js
index c20e39c..28fb92d 100644
--- a/test/unit/fx.js
+++ b/test/unit/fx.js
@@ -4,9 +4,9 @@ test("animate(Hash, Object, Function)", function() {
expect(1);
stop();
var hash = {opacity: 'show'};
- var hashCopy = $.extend({}, hash);
- $('#foo').animate(hash, 0, function() {
- ok( hash.opacity == hashCopy.opacity, 'Check if animate changed the hash parameter' );
+ var hashCopy = jQuery.extend({}, hash);
+ jQuery('#foo').animate(hash, 0, function() {
+ equals( hash.opacity, hashCopy.opacity, 'Check if animate changed the hash parameter' );
start();
});
});
@@ -17,7 +17,7 @@ test("animate option (queue === false)", function () {
var order = [];
- var $foo = $("#foo");
+ var $foo = jQuery("#foo");
$foo.animate({width:'100px'}, 200, function () {
// should finish after unqueued animation so second
order.push(2);
@@ -34,121 +34,203 @@ test("animate option (queue === false)", function () {
});
});
-test("queue() defaults to 'fx' type", function () {
- expect(2);
+test("animate non-element", function(){
+ expect(1);
stop();
- var $foo = $("#foo");
- $foo.queue("fx", [ "sample", "array" ]);
- var arr = $foo.queue();
- isSet(arr, [ "sample", "array" ], "queue() got an array set with type 'fx'");
- $foo.queue([ "another", "one" ]);
- var arr = $foo.queue("fx");
- isSet(arr, [ "another", "one" ], "queue('fx') got an array set with no type");
- // clean up after test
- $foo.queue([]);
+ var obj = { test: 0 };
- start();
+ jQuery(obj).animate({test: 200}, 200, function(){
+ equals( obj.test, 200, "The custom property should be modified." );
+ start();
+ });
});
test("stop()", function() {
expect(3);
stop();
- reset();
- var foo = $("#foo")[0];
- var h = foo.style.height;
+ var $foo = jQuery("#nothiddendiv");
+ var w = 0;
+ $foo.hide().width(200).width();
- $("#foo").slideUp(1000);
+ $foo.animate({ width:'show' }, 1000);
setTimeout(function(){
- var nh = foo.style.height;
- ok( nh != h, "An animation occurred " + nh + " " + h );
- $("#foo").stop();
+ var nw = $foo.width();
+ ok( nw != w, "An animation occurred " + nw + "px " + w + "px");
+ $foo.stop();
- nh = foo.style.height;
- ok( nh != h, "Stop didn't reset the animation " + nh + " " + h );
+ nw = $foo.width();
+ ok( nw != w, "Stop didn't reset the animation " + nw + "px " + w + "px");
setTimeout(function(){
- equals( nh, foo.style.height, "The animation didn't continue" );
+ equals( nw, $foo.width(), "The animation didn't continue" );
start();
}, 100);
}, 100);
});
-test("toggle()", function() {
+test("stop() - several in queue", function() {
+ expect(4);
+ stop();
+
+ var $foo = jQuery("#nothiddendiv");
+ var w = 0;
+ $foo.hide().width(200).width();
+
+ $foo.animate({ width:'show' }, 1000);
+ $foo.animate({ width:'hide' }, 1000);
+ $foo.animate({ width:'show' }, 1000);
+ setTimeout(function(){
+ equals( $foo.queue().length, 3, "All 3 still in the queue" );
+ var nw = $foo.width();
+ ok( nw != w, "An animation occurred " + nw + "px " + w + "px");
+ $foo.stop();
+
+ nw = $foo.width();
+ ok( nw != w, "Stop didn't reset the animation " + nw + "px " + w + "px");
+ equals( $foo.queue().length, 2, "The next animation continued" );
+ $foo.stop(true);
+ start();
+ }, 100);
+});
+
+test("stop(clearQueue)", function() {
+ expect(4);
+ stop();
+
+ var $foo = jQuery("#nothiddendiv");
+ var w = 0;
+ $foo.hide().width(200).width();
+
+ $foo.animate({ width:'show' }, 1000);
+ $foo.animate({ width:'hide' }, 1000);
+ $foo.animate({ width:'show' }, 1000);
+ setTimeout(function(){
+ var nw = $foo.width();
+ ok( nw != w, "An animation occurred " + nw + "px " + w + "px");
+ $foo.stop(true);
+
+ nw = $foo.width();
+ ok( nw != w, "Stop didn't reset the animation " + nw + "px " + w + "px");
+
+ equals( $foo.queue().length, 0, "The animation queue was cleared" );
+ setTimeout(function(){
+ equals( nw, $foo.width(), "The animation didn't continue" );
+ start();
+ }, 100);
+ }, 100);
+});
+
+test("stop(clearQueue, gotoEnd)", function() {
expect(3);
- var x = $("#foo");
- ok( x.is(":visible") );
+ stop();
+
+ var $foo = jQuery("#nothiddendiv");
+ var w = 0;
+ $foo.hide().width(200).width();
+
+ $foo.animate({ width:'show' }, 1000);
+ $foo.animate({ width:'hide' }, 1000);
+ $foo.animate({ width:'show' }, 1000);
+ $foo.animate({ width:'hide' }, 1000);
+ setTimeout(function(){
+ var nw = $foo.width();
+ ok( nw != w, "An animation occurred " + nw + "px " + w + "px");
+ $foo.stop(false, true);
+
+ nw = $foo.width();
+ equals( nw, 200, "Stop() reset the animation" );
+
+ setTimeout(function(){
+ equals( $foo.queue().length, 3, "The next animation continued" );
+ $foo.stop(true);
+ start();
+ }, 100);
+ }, 100);
+});
+
+test("toggle()", function() {
+ expect(6);
+ var x = jQuery("#foo");
+ ok( x.is(":visible"), "is visible" );
x.toggle();
- ok( x.is(":hidden") );
+ ok( x.is(":hidden"), "is hidden" );
x.toggle();
- ok( x.is(":visible") );
+ ok( x.is(":visible"), "is visible again" );
+
+ x.toggle(true);
+ ok( x.is(":visible"), "is visible" );
+ x.toggle(false);
+ ok( x.is(":hidden"), "is hidden" );
+ x.toggle(true);
+ ok( x.is(":visible"), "is visible again" );
});
var visible = {
Normal: function(elem){},
"CSS Hidden": function(elem){
- $(this).addClass("hidden");
+ jQuery(this).addClass("hidden");
},
"JS Hidden": function(elem){
- $(this).hide();
+ jQuery(this).hide();
}
};
var from = {
"CSS Auto": function(elem,prop){
- $(elem).addClass("auto" + prop)
+ jQuery(elem).addClass("auto" + prop)
.text("This is a long string of text.");
return "";
},
"JS Auto": function(elem,prop){
- $(elem).css(prop,"auto")
+ jQuery(elem).css(prop,"auto")
.text("This is a long string of text.");
return "";
},
"CSS 100": function(elem,prop){
- $(elem).addClass("large" + prop);
+ jQuery(elem).addClass("large" + prop);
return "";
},
"JS 100": function(elem,prop){
- $(elem).css(prop,prop == "opacity" ? 1 : "100px");
+ jQuery(elem).css(prop,prop == "opacity" ? 1 : "100px");
return prop == "opacity" ? 1 : 100;
},
"CSS 50": function(elem,prop){
- $(elem).addClass("med" + prop);
+ jQuery(elem).addClass("med" + prop);
return "";
},
"JS 50": function(elem,prop){
- $(elem).css(prop,prop == "opacity" ? 0.50 : "50px");
+ jQuery(elem).css(prop,prop == "opacity" ? 0.50 : "50px");
return prop == "opacity" ? 0.5 : 50;
},
"CSS 0": function(elem,prop){
- $(elem).addClass("no" + prop);
+ jQuery(elem).addClass("no" + prop);
return "";
},
"JS 0": function(elem,prop){
- $(elem).css(prop,prop == "opacity" ? 0 : "0px");
+ jQuery(elem).css(prop,prop == "opacity" ? 0 : "0px");
return 0;
}
};
var to = {
"show": function(elem,prop){
- $(elem).hide().addClass("wide"+prop);
+ jQuery(elem).hide().addClass("wide"+prop);
return "show";
},
"hide": function(elem,prop){
- $(elem).addClass("wide"+prop);
+ jQuery(elem).addClass("wide"+prop);
return "hide";
},
"100": function(elem,prop){
- $(elem).addClass("wide"+prop);
+ jQuery(elem).addClass("wide"+prop);
return prop == "opacity" ? 1 : 100;
},
"50": function(elem,prop){
return prop == "opacity" ? 0.50 : 50;
},
"0": function(elem,prop){
- $(elem).addClass("noback");
+ jQuery(elem).addClass("noback");
return 0;
}
};
@@ -156,8 +238,8 @@ var to = {
function checkOverflowDisplay(){
var o = jQuery.css( this, "overflow" );
- ok(o == "visible", "Overflow should be visible: " + o);
- ok(jQuery.css( this, "display" ) == "inline", "Display shouldn't be tampered with.");
+ equals(o, "visible", "Overflow should be visible: " + o);
+ equals(jQuery.css( this, "display" ), "inline", "Display shouldn't be tampered with.");
start();
}
@@ -218,31 +300,31 @@ jQuery.each( from, function(fn, f){
elem.animate(anim, 50, function(){
if ( t_w == "show" )
- ok( this.style.display == "block", "Showing, display should block: " + this.style.display);
+ equals( this.style.display, "block", "Showing, display should block: " + this.style.display);
if ( t_w == "hide"||t_w == "show" )
- ok(this.style.width.indexOf(f_w) == 0, "Width must be reset to " + f_w + ": " + this.style.width);
+ equals(this.style.width.indexOf(f_w), 0, "Width must be reset to " + f_w + ": " + this.style.width);
if ( t_h == "hide"||t_h == "show" )
- ok(this.style.height.indexOf(f_h) == 0, "Height must be reset to " + f_h + ": " + this.style.height);
+ equals(this.style.height.indexOf(f_h), 0, "Height must be reset to " + f_h + ": " + this.style.height);
var cur_o = jQuery.attr(this.style, "opacity");
if ( cur_o !== "" ) cur_o = parseFloat( cur_o );
if ( t_o == "hide"||t_o == "show" )
- ok(cur_o == f_o, "Opacity must be reset to " + f_o + ": " + cur_o);
+ equals(cur_o, f_o, "Opacity must be reset to " + f_o + ": " + cur_o);
if ( t_w == "hide" )
- ok(this.style.display == "none", "Hiding, display should be none: " + this.style.display);
+ equals(this.style.display, "none", "Hiding, display should be none: " + this.style.display);
if ( t_o.constructor == Number ) {
- ok(cur_o == t_o, "Final opacity should be " + t_o + ": " + cur_o);
+ equals(cur_o, t_o, "Final opacity should be " + t_o + ": " + cur_o);
ok(jQuery.curCSS(this, "opacity") != "" || cur_o == t_o, "Opacity should be explicitly set to " + t_o + ", is instead: " + cur_o);
}
if ( t_w.constructor == Number ) {
- ok(this.style.width == t_w + "px", "Final width should be " + t_w + ": " + this.style.width);
+ equals(this.style.width, t_w + "px", "Final width should be " + t_w + ": " + this.style.width);
var cur_w = jQuery.css(this,"width");
@@ -250,7 +332,7 @@ jQuery.each( from, function(fn, f){
}
if ( t_h.constructor == Number ) {
- ok(this.style.height == t_h + "px", "Final height should be " + t_h + ": " + this.style.height);
+ equals(this.style.height, t_h + "px", "Final height should be " + t_h + ": " + this.style.height);
var cur_h = jQuery.css(this,"height");
@@ -259,7 +341,7 @@ jQuery.each( from, function(fn, f){
if ( t_h == "show" ) {
var old_h = jQuery.curCSS(this, "height");
- $(elem).append("
Some more text
and some more...");
+ jQuery(elem).append("
Some more text
and some more...");
ok(old_h != jQuery.css(this, "height" ), "Make sure height is auto.");
}
@@ -287,57 +369,57 @@ function checkState(){
var self = this;
jQuery.each(this.save, function(c,v){
var cur = jQuery.css(self,c);
- ok( v == cur, "Make sure that " + c + " is reset (Old: " + v + " Cur: " + cur + ")");
+ equals( v, cur, "Make sure that " + c + " is reset (Old: " + v + " Cur: " + cur + ")");
});
start();
}
// Chaining Tests
test("Chain fadeOut fadeIn", function() {
- $('#fadein div').saveState().fadeOut('fast').fadeIn('fast',checkState);
+ jQuery('#fadein div').saveState().fadeOut('fast').fadeIn('fast',checkState);
});
test("Chain fadeIn fadeOut", function() {
- $('#fadeout div').saveState().fadeIn('fast').fadeOut('fast',checkState);
+ jQuery('#fadeout div').saveState().fadeIn('fast').fadeOut('fast',checkState);
});
test("Chain hide show", function() {
- $('#show div').saveState().hide('fast').show('fast',checkState);
+ jQuery('#show div').saveState().hide('fast').show('fast',checkState);
});
test("Chain show hide", function() {
- $('#hide div').saveState().show('fast').hide('fast',checkState);
+ jQuery('#hide div').saveState().show('fast').hide('fast',checkState);
});
test("Chain toggle in", function() {
- $('#togglein div').saveState().toggle('fast').toggle('fast',checkState);
+ jQuery('#togglein div').saveState().toggle('fast').toggle('fast',checkState);
});
test("Chain toggle out", function() {
- $('#toggleout div').saveState().toggle('fast').toggle('fast',checkState);
+ jQuery('#toggleout div').saveState().toggle('fast').toggle('fast',checkState);
});
test("Chain slideDown slideUp", function() {
- $('#slidedown div').saveState().slideDown('fast').slideUp('fast',checkState);
+ jQuery('#slidedown div').saveState().slideDown('fast').slideUp('fast',checkState);
});
test("Chain slideUp slideDown", function() {
- $('#slideup div').saveState().slideUp('fast').slideDown('fast',checkState);
+ jQuery('#slideup div').saveState().slideUp('fast').slideDown('fast',checkState);
});
test("Chain slideToggle in", function() {
- $('#slidetogglein div').saveState().slideToggle('fast').slideToggle('fast',checkState);
+ jQuery('#slidetogglein div').saveState().slideToggle('fast').slideToggle('fast',checkState);
});
test("Chain slideToggle out", function() {
- $('#slidetoggleout div').saveState().slideToggle('fast').slideToggle('fast',checkState);
+ jQuery('#slidetoggleout div').saveState().slideToggle('fast').slideToggle('fast',checkState);
});
function makeTest( text ){
- var elem = $("