X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Fdata.js;h=812ccd235b071c7d923ac67fb0f5575e72bb0cd1;hb=89dc1e01435ebeef173c9a843096cd5c1fbc9dd8;hp=5d390e1a20dc65363595a10d7a99407c66869d6c;hpb=7cfec99858bf397714d3aac1c0ba4708d2ddb986;p=jquery.git diff --git a/test/unit/data.js b/test/unit/data.js index 5d390e1..812ccd2 100644 --- a/test/unit/data.js +++ b/test/unit/data.js @@ -180,22 +180,6 @@ test("queue(name) passes in the next item in the queue as a parameter", function div.removeData(); }); - expect(1); - - var div = jQuery({}); - var counter = 0; - - div.queue("foo", function(next) { - counter++; - jQuery(this).clearQueue("foo"); - next(); - }).queue("foo", function(next) { - counter++; - }); - - div.dequeue("foo"); - - equals(counter, 1, "the queue was cleared"); test("queue(name) passes in the next item in the queue as a parameter", function() { expect(2); @@ -229,12 +213,10 @@ test("queue() passes in the next item in the queue as a parameter to fx queues", }).queue(function(next) { equals(++counter, 2, "Next was called"); next(); - }).queue(function() { + }).queue("bar", function() { equals(++counter, 3, "Other queues are not triggered by next()") }); - div.dequeue(); - div.removeData(); }); @@ -255,6 +237,8 @@ test("clearQueue(name) clears the queue", function() { div.dequeue("foo"); equals(counter, 1, "the queue was cleared"); + + div.removeData(); }); test("clearQueue() clears the fx queue", function() { @@ -265,13 +249,12 @@ test("clearQueue() clears the fx queue", function() { div.queue(function(next) { counter++; - jQuery(this).clearQueue(); - next(); + setTimeout(function() { jQuery(this).clearQueue(); next(); }, 50); }).queue(function(next) { counter++; }); - div.dequeue(); - equals(counter, 1, "the queue was cleared"); -}) + + div.removeData(); +});