git.asbjorn.biz
/
jquery.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
revision 6494 accidentally reverted some changes to offset module
[jquery.git]
/
test
/
unit
/
fx.js
diff --git
a/test/unit/fx.js
b/test/unit/fx.js
index
c6da80d
..
4b7d371
100644
(file)
--- a/
test/unit/fx.js
+++ b/
test/unit/fx.js
@@
-46,6
+46,7
@@
test("animate(Hash, Object, Function)", function() {
});
});
});
});
+/* // This test ends up being flaky depending upon the CPU load
test("animate option (queue === false)", function () {
expect(1);
stop();
test("animate option (queue === false)", function () {
expect(1);
stop();
@@
-53,21
+54,18
@@
test("animate option (queue === false)", function () {
var order = [];
var $foo = jQuery("#foo");
var order = [];
var $foo = jQuery("#foo");
- $foo.animate({width:'100px'}, 200, function () {
+ $foo.animate({width:'100px'}, 3000, function () {
// should finish after unqueued animation so second
order.push(2);
// should finish after unqueued animation so second
order.push(2);
+ isSet( order, [ 1, 2 ], "Animations finished in the correct order" );
+ start();
});
$foo.animate({fontSize:'2em'}, {queue:false, duration:10, complete:function () {
// short duration and out of queue so should finish first
order.push(1);
}});
});
$foo.animate({fontSize:'2em'}, {queue:false, duration:10, complete:function () {
// short duration and out of queue so should finish first
order.push(1);
}});
- $foo.animate({height:'100px'}, 100, function() {
- // queued behind the first animation so should finish third
- order.push(3);
- isSet( order, [ 1, 2, 3], "Animations finished in the correct order" );
- start();
- });
});
});
+*/
test("animate duration 0", function() {
expect(5);
test("animate duration 0", function() {
expect(5);