git.asbjorn.biz
/
jquery.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed broken hidden/visible test.
[jquery.git]
/
test
/
unit
/
fx.js
diff --git
a/test/unit/fx.js
b/test/unit/fx.js
index
87e6aea
..
da22de2
100644
(file)
--- a/
test/unit/fx.js
+++ b/
test/unit/fx.js
@@
-1,13
+1,19
@@
module("fx");
test("show()", function() {
module("fx");
test("show()", function() {
- expect(15);
+ expect(16);
var pass = true, div = jQuery("#main div");
div.show().each(function(){
if ( this.style.display == "none" ) pass = false;
});
ok( pass, "Show" );
var pass = true, div = jQuery("#main div");
div.show().each(function(){
if ( this.style.display == "none" ) pass = false;
});
ok( pass, "Show" );
+ pass = true;
+ div.hide().show(null).each(function() {
+ if ( this.style.display == "none" ) pass = false;
+ });
+ ok( pass, "Show will null speed");
+
jQuery("#main").append('<div id="show-tests"><div><p><a href="#"></a></p><code></code><pre></pre><span></span></div><table><thead><tr><th></th></tr></thead><tbody><tr><td></td></tr></tbody></table><ul><li></li></ul></div>');
var old = jQuery("#show-tests table").show().css("display") !== "table";
jQuery("#main").append('<div id="show-tests"><div><p><a href="#"></a></p><code></code><pre></pre><span></span></div><table><thead><tr><th></th></tr></thead><tbody><tr><td></td></tr></tbody></table><ul><li></li></ul></div>');
var old = jQuery("#show-tests table").show().css("display") !== "table";
@@
-57,7
+63,7
@@
test("animate option (queue === false)", function () {
$foo.animate({width:'100px'}, 3000, function () {
// should finish after unqueued animation so second
order.push(2);
$foo.animate({width:'100px'}, 3000, function () {
// should finish after unqueued animation so second
order.push(2);
- isSet( order, [ 1, 2 ], "Animations finished in the correct order" );
+ same( order, [ 1, 2 ], "Animations finished in the correct order" );
start();
});
$foo.animate({fontSize:'2em'}, {queue:false, duration:10, complete:function () {
start();
});
$foo.animate({fontSize:'2em'}, {queue:false, duration:10, complete:function () {
@@
-67,37
+73,62
@@
test("animate option (queue === false)", function () {
});
*/
});
*/
+test("animate with no properties", function() {
+ expect(1);
+
+ var divs = jQuery("div"), count = 0;
+
+ divs.animate({}, function(){
+ count++;
+ });
+
+ equals( divs.length, count, "Make sure that callback is called for each element in the set." );
+});
+
test("animate duration 0", function() {
test("animate duration 0", function() {
- expect(5);
+ expect(11);
stop();
stop();
- var $elems = jQuery([{ a:0 },{ a:0 }]),
- counter = 0,
- count = function(){
- counter++;
- };
+ var $elems = jQuery([{ a:0 },{ a:0 }]), counter = 0;
equals( jQuery.timers.length, 0, "Make sure no animation was running from another test" );
equals( jQuery.timers.length, 0, "Make sure no animation was running from another test" );
- $elems.eq(0).animate( {a:1}, 0, count );
+ $elems.eq(0).animate( {a:1}, 0, function(){
+ ok( true, "Animate a simple property." );
+ counter++;
+ });
// Failed until [6115]
equals( jQuery.timers.length, 0, "Make sure synchronic animations are not left on jQuery.timers" );
equals( counter, 1, "One synchronic animations" );
// Failed until [6115]
equals( jQuery.timers.length, 0, "Make sure synchronic animations are not left on jQuery.timers" );
equals( counter, 1, "One synchronic animations" );
- $elems.animate( { a:2 }, 0, count );
+ $elems.animate( { a:2 }, 0, function(){
+ ok( true, "Animate a second simple property." );
+ counter++;
+ });
equals( counter, 3, "Multiple synchronic animations" );
equals( counter, 3, "Multiple synchronic animations" );
- $elems.eq(0).animate( {a:3}, 0, count );
- $elems.eq(1).animate( {a:3}, 20, function(){
- count();
+ $elems.eq(0).animate( {a:3}, 0, function(){
+ ok( true, "Animate a third simple property." );
+ counter++;
+ });
+ $elems.eq(1).animate( {a:3}, 200, function(){
+ counter++;
// Failed until [6115]
equals( counter, 5, "One synchronic and one asynchronic" );
start();
// Failed until [6115]
equals( counter, 5, "One synchronic and one asynchronic" );
start();
- });
+ });
+
+ var $elem = jQuery("<div />");
+ $elem.show(0, function(){
+ ok(true, "Show callback with no duration");
+ });
+ $elem.hide(0, function(){
+ ok(true, "Hide callback with no duration");
+ });
});
test("animate hyphenated properties", function(){
});
test("animate hyphenated properties", function(){