diff options
Diffstat (limited to 'test/unit/effects.js')
| -rw-r--r-- | test/unit/effects.js | 904 |
1 files changed, 452 insertions, 452 deletions
diff --git a/test/unit/effects.js b/test/unit/effects.js index f4bd9c145..31822274c 100644 --- a/test/unit/effects.js +++ b/test/unit/effects.js @@ -7,7 +7,7 @@ if ( !jQuery.fx ) { var oldRaf = window.requestAnimationFrame; -module( "effects", { +QUnit.module( "effects", { setup: function() { window.requestAnimationFrame = null; this.sandbox = sinon.sandbox.create(); @@ -25,36 +25,36 @@ module( "effects", { } } ); -test( "sanity check", function() { - expect( 1 ); - equal( jQuery( "#dl:visible, #qunit-fixture:visible, #foo:visible" ).length, 3, "QUnit state is correct for testing effects" ); +QUnit.test( "sanity check", function( assert ) { + assert.expect( 1 ); + assert.equal( jQuery( "#dl:visible, #qunit-fixture:visible, #foo:visible" ).length, 3, "QUnit state is correct for testing effects" ); } ); -test( "show() basic", function() { - expect( 1 ); +QUnit.test( "show() basic", function( assert ) { + assert.expect( 1 ); var div = jQuery( "<div>" ).hide().appendTo( "#qunit-fixture" ).show(); - equal( div.css( "display" ), "block", "Make sure pre-hidden divs show" ); + assert.equal( div.css( "display" ), "block", "Make sure pre-hidden divs show" ); // Clean up the detached node div.remove(); } ); -test( "show()", function() { - expect( 27 ); +QUnit.test( "show()", function( assert ) { + assert.expect( 27 ); var div, speeds, test, displaysActual, displaysExpected, hiddendiv = jQuery( "div.hidden" ); - equal( jQuery.css( hiddendiv[ 0 ], "display" ), "none", "hiddendiv is display: none" ); + assert.equal( jQuery.css( hiddendiv[ 0 ], "display" ), "none", "hiddendiv is display: none" ); hiddendiv.css( "display", "block" ); - equal( jQuery.css( hiddendiv[ 0 ], "display" ), "block", "hiddendiv is display: block" ); + assert.equal( jQuery.css( hiddendiv[ 0 ], "display" ), "block", "hiddendiv is display: block" ); hiddendiv.show(); - equal( jQuery.css( hiddendiv[ 0 ], "display" ), "block", "hiddendiv is display: block" ); + assert.equal( jQuery.css( hiddendiv[ 0 ], "display" ), "block", "hiddendiv is display: block" ); hiddendiv.css( "display", "" ); @@ -63,7 +63,7 @@ test( "show()", function() { div = jQuery( "#fx-queue div" ).slice( 0, 4 ); div.show().each( function() { - notEqual( this.style.display, "none", "don't change any <div> with display block" ); + assert.notEqual( this.style.display, "none", "don't change any <div> with display block" ); } ); speeds = { @@ -79,7 +79,7 @@ test( "show()", function() { pass = false; } } ); - ok( pass, "Show with " + name ); + assert.ok( pass, "Show with " + name ); } ); jQuery.each( speeds, function( name, speed ) { @@ -87,7 +87,7 @@ test( "show()", function() { div.hide().show( speed, function() { pass = false; } ); - ok( pass, "Show with " + name + " does not call animate callback" ); + assert.ok( pass, "Show with " + name + " does not call animate callback" ); } ); // Tolerate data from show()/hide() @@ -122,7 +122,7 @@ test( "show()", function() { jQuery.each( test, function( selector, expected ) { var elem = jQuery( selector, "#show-tests" ).show(); - equal( elem.css( "display" ), expected, "Show using correct display type for " + selector ); + assert.equal( elem.css( "display" ), expected, "Show using correct display type for " + selector ); } ); jQuery( "#show-tests" ).remove(); @@ -132,8 +132,8 @@ test( "show()", function() { jQuery( "<div>test</div> text <span>test</span>" ).hide().remove(); } ); -test( "show(Number) - other displays", function() { - expect( 30 ); +QUnit.test( "show(Number) - other displays", function( assert ) { + assert.expect( 30 ); jQuery( "<div id='show-tests'>" + @@ -174,7 +174,7 @@ test( "show(Number) - other displays", function() { this.clock.tick( 50 ); jQuery.each( test, function( selector, expected ) { jQuery( selector, "#show-tests" ).each( function() { - equal( + assert.equal( jQuery( this ).css( "display" ), expected === "inline" ? "inline-block" : expected, "Correct display type during animation for " + selector @@ -184,7 +184,7 @@ test( "show(Number) - other displays", function() { this.clock.tick( 50 ); jQuery.each( test, function( selector, expected ) { jQuery( selector, "#show-tests" ).each( function() { - equal( jQuery( this ).css( "display" ), expected, + assert.equal( jQuery( this ).css( "display" ), expected, "Correct display type after animation for " + selector ); } ); } ); @@ -193,8 +193,8 @@ test( "show(Number) - other displays", function() { } ); // Supports #7397 -test( "Persist correct display value", function() { - expect( 3 ); +QUnit.test( "Persist correct display value", function( assert ) { + assert.expect( 3 ); jQuery( "<div id='show-tests'><span style='position:absolute;'>foo</span></div>" ) .appendTo( "#qunit-fixture" ).find( "*" ).css( "display", "none" ); @@ -211,11 +211,11 @@ test( "Persist correct display value", function() { $span.hide(); $span.fadeIn( 100, function() { - equal( $span.css( "display" ), display, "Expecting display: " + display ); + assert.equal( $span.css( "display" ), display, "Expecting display: " + display ); $span.fadeOut( 100, function() { - equal( $span.css( "display" ), displayNone, "Expecting display: " + displayNone ); + assert.equal( $span.css( "display" ), displayNone, "Expecting display: " + displayNone ); $span.fadeIn( 100, function() { - equal( $span.css( "display" ), display, "Expecting display: " + display ); + assert.equal( $span.css( "display" ), display, "Expecting display: " + display ); } ); } ); } ); @@ -225,16 +225,16 @@ test( "Persist correct display value", function() { QUnit.expectJqData( this, $span, "display" ); } ); -test( "animate(Hash, Object, Function)", function() { - expect( 1 ); +QUnit.test( "animate(Hash, Object, Function)", function( assert ) { + assert.expect( 1 ); var hash = { opacity: "show" }, hashCopy = jQuery.extend( {}, hash ); jQuery( "#foo" ).animate( hash, 0, function() { - equal( hash.opacity, hashCopy.opacity, "Check if animate changed the hash parameter" ); + assert.equal( hash.opacity, hashCopy.opacity, "Check if animate changed the hash parameter" ); } ); } ); -test( "animate relative values", function() { +QUnit.test( "animate relative values", function( assert ) { var value = 40, clock = this.clock, @@ -244,7 +244,7 @@ test( "animate relative values", function() { .css( { position: "absolute", height: "50em", width: "50em" } ), animations = bases.length * adjustments.length; - expect( 2 * animations ); + assert.expect( 2 * animations ); jQuery.each( bases, function( _, baseUnit ) { jQuery.each( adjustments, function( _, adjustUnit ) { @@ -261,9 +261,9 @@ test( "animate relative values", function() { adjustScale = elem[ 0 ].offsetWidth / value; elem.css( "width", base ).animate( adjust, 100, function() { - equal( this.offsetHeight, value * baseScale + 2 * adjustScale, + assert.equal( this.offsetHeight, value * baseScale + 2 * adjustScale, baseUnit + "+=" + adjustUnit ); - equal( this.offsetWidth, value * baseScale - 2 * adjustScale, + assert.equal( this.offsetWidth, value * baseScale - 2 * adjustScale, baseUnit + "-=" + adjustUnit ); } ); @@ -273,56 +273,56 @@ test( "animate relative values", function() { } ); } ); -test( "animate negative height", function() { - expect( 1 ); +QUnit.test( "animate negative height", function( assert ) { + assert.expect( 1 ); jQuery( "#foo" ).animate( { height: -100 }, 100, function() { - equal( this.offsetHeight, 0, "Verify height." ); + assert.equal( this.offsetHeight, 0, "Verify height." ); } ); this.clock.tick( 100 ); } ); -test( "animate negative margin", function() { - expect( 1 ); +QUnit.test( "animate negative margin", function( assert ) { + assert.expect( 1 ); jQuery( "#foo" ).animate( { "marginTop": -100 }, 100, function() { - equal( jQuery( this ).css( "marginTop" ), "-100px", "Verify margin." ); + assert.equal( jQuery( this ).css( "marginTop" ), "-100px", "Verify margin." ); } ); this.clock.tick( 100 ); } ); -test( "animate negative margin with px", function() { - expect( 1 ); +QUnit.test( "animate negative margin with px", function( assert ) { + assert.expect( 1 ); jQuery( "#foo" ).animate( { marginTop: "-100px" }, 100, function() { - equal( jQuery( this ).css( "marginTop" ), "-100px", "Verify margin." ); + assert.equal( jQuery( this ).css( "marginTop" ), "-100px", "Verify margin." ); } ); this.clock.tick( 100 ); } ); -test( "animate negative padding", function() { - expect( 1 ); +QUnit.test( "animate negative padding", function( assert ) { + assert.expect( 1 ); jQuery( "#foo" ).animate( { "paddingBottom": -100 }, 100, function() { - equal( jQuery( this ).css( "paddingBottom" ), "0px", "Verify paddingBottom." ); + assert.equal( jQuery( this ).css( "paddingBottom" ), "0px", "Verify paddingBottom." ); } ); this.clock.tick( 100 ); } ); -test( "animate block as inline width/height", function() { - expect( 3 ); +QUnit.test( "animate block as inline width/height", function( assert ) { + assert.expect( 3 ); var span = jQuery( "<span>" ).css( "display", "inline-block" ).appendTo( "body" ); span.remove(); jQuery( "#foo" ).css( { display: "inline", width: "", height: "" } ).animate( { width: 42, height: 42 }, 100, function() { - equal( jQuery( this ).css( "display" ), "inline-block", "inline-block was set on non-floated inline element when animating width/height" ); - equal( this.offsetWidth, 42, "width was animated" ); - equal( this.offsetHeight, 42, "height was animated" ); + assert.equal( jQuery( this ).css( "display" ), "inline-block", "inline-block was set on non-floated inline element when animating width/height" ); + assert.equal( this.offsetWidth, 42, "width was animated" ); + assert.equal( this.offsetHeight, 42, "height was animated" ); } ); this.clock.tick( 100 ); } ); -test( "animate native inline width/height", function() { - expect( 3 ); +QUnit.test( "animate native inline width/height", function( assert ) { + assert.expect( 3 ); var span = jQuery( "<span>" ).css( "display", "inline-block" ).appendTo( "body" ); @@ -332,16 +332,16 @@ test( "animate native inline width/height", function() { .append( "<span>text</span>" ) .children( "span" ) .animate( { width: 42, height: 42 }, 100, function() { - equal( jQuery( this ).css( "display" ), "inline-block", "inline-block was set on non-floated inline element when animating width/height" ); - equal( this.offsetWidth, 42, "width was animated" ); - equal( this.offsetHeight, 42, "height was animated" ); + assert.equal( jQuery( this ).css( "display" ), "inline-block", "inline-block was set on non-floated inline element when animating width/height" ); + assert.equal( this.offsetWidth, 42, "width was animated" ); + assert.equal( this.offsetHeight, 42, "height was animated" ); } ); this.clock.tick( 100 ); } ); -test( "animate block width/height", function() { - expect( 3 ); +QUnit.test( "animate block width/height", function( assert ) { + assert.expect( 3 ); jQuery( "<div>" ).appendTo( "#qunit-fixture" ).css( { display: "block", @@ -355,44 +355,44 @@ test( "animate block width/height", function() { duration: 100, step: function() { if ( jQuery( this ).width() > 42 ) { - ok( false, "width was incorrectly augmented during animation" ); + assert.ok( false, "width was incorrectly augmented during animation" ); } }, complete: function() { - equal( jQuery( this ).css( "display" ), "block", "inline-block was not set on block element when animating width/height" ); - equal( jQuery( this ).width(), 42, "width was animated" ); - equal( jQuery( this ).height(), 42, "height was animated" ); + assert.equal( jQuery( this ).css( "display" ), "block", "inline-block was not set on block element when animating width/height" ); + assert.equal( jQuery( this ).width(), 42, "width was animated" ); + assert.equal( jQuery( this ).height(), 42, "height was animated" ); } } ); this.clock.tick( 100 ); } ); -test( "animate table width/height", function() { - expect( 1 ); +QUnit.test( "animate table width/height", function( assert ) { + assert.expect( 1 ); jQuery( "#table" ).animate( { width: 42, height: 42 }, 100, function() { - equal( jQuery( this ).css( "display" ), "table", "display mode is correct" ); + assert.equal( jQuery( this ).css( "display" ), "table", "display mode is correct" ); } ); this.clock.tick( 100 ); } ); -test( "animate table-row width/height", function() { - expect( 3 ); +QUnit.test( "animate table-row width/height", function( assert ) { + assert.expect( 3 ); var tr = jQuery( "#table" ) .attr( { "cellspacing": 0, "cellpadding": 0, "border": 0 } ) .html( "<tr style='height:42px;'><td style='padding:0;'><div style='width:20px;height:20px;'></div></td></tr>" ) .find( "tr" ); tr.animate( { width: 10, height: 10 }, 100, function() { - equal( jQuery( this ).css( "display" ), "table-row", "display mode is correct" ); - equal( this.offsetWidth, 20, "width animated to shrink wrap point" ); - equal( this.offsetHeight, 20, "height animated to shrink wrap point" ); + assert.equal( jQuery( this ).css( "display" ), "table-row", "display mode is correct" ); + assert.equal( this.offsetWidth, 20, "width animated to shrink wrap point" ); + assert.equal( this.offsetHeight, 20, "height animated to shrink wrap point" ); } ); this.clock.tick( 100 ); } ); -test( "animate table-cell width/height", function() { - expect( 3 ); +QUnit.test( "animate table-cell width/height", function( assert ) { + assert.expect( 3 ); var td = jQuery( "#table" ) .attr( { "cellspacing": 0, "cellpadding": 0, "border": 0 } ) @@ -400,42 +400,42 @@ test( "animate table-cell width/height", function() { .find( "td" ); td.animate( { width: 10, height: 10 }, 100, function() { - equal( jQuery( this ).css( "display" ), "table-cell", "display mode is correct" ); - equal( this.offsetWidth, 20, "width animated to shrink wrap point" ); - equal( this.offsetHeight, 20, "height animated to shrink wrap point" ); + assert.equal( jQuery( this ).css( "display" ), "table-cell", "display mode is correct" ); + assert.equal( this.offsetWidth, 20, "width animated to shrink wrap point" ); + assert.equal( this.offsetHeight, 20, "height animated to shrink wrap point" ); } ); this.clock.tick( 100 ); } ); -test( "animate percentage(%) on width/height", function() { - expect( 2 ); +QUnit.test( "animate percentage(%) on width/height", function( assert ) { + assert.expect( 2 ); var $div = jQuery( "<div style='position:absolute;top:-999px;left:-999px;width:60px;height:60px;'><div style='width:50%;height:50%;'></div></div>" ) .appendTo( "#qunit-fixture" ).children( "div" ); $div.animate( { width: "25%", height: "25%" }, 13, function() { var $this = jQuery( this ); - equal( $this.css( "width" ), "15px", "Width was animated to 15px rather than 25px" ); - equal( $this.css( "height" ), "15px", "Height was animated to 15px rather than 25px" ); + assert.equal( $this.css( "width" ), "15px", "Width was animated to 15px rather than 25px" ); + assert.equal( $this.css( "height" ), "15px", "Height was animated to 15px rather than 25px" ); } ); this.clock.tick( 20 ); } ); -test( "animate resets overflow-x and overflow-y when finished", function() { - expect( 2 ); +QUnit.test( "animate resets overflow-x and overflow-y when finished", function( assert ) { + assert.expect( 2 ); jQuery( "#foo" ) .css( { display: "block", width: 20, height: 20, overflowX: "visible", overflowY: "auto" } ) .animate( { width: 42, height: 42 }, 100, function() { - equal( this.style.overflowX, "visible", "overflow-x is visible" ); - equal( this.style.overflowY, "auto", "overflow-y is auto" ); + assert.equal( this.style.overflowX, "visible", "overflow-x is visible" ); + assert.equal( this.style.overflowY, "auto", "overflow-y is auto" ); } ); this.clock.tick( 100 ); } ); /* // This test ends up being flaky depending upon the CPU load -test("animate option (queue === false)", function () { - expect(1); - stop(); +QUnit.test("animate option (queue === false)", function( assert ) { + assert.expect(1); + QUnit.stop(); var order = []; @@ -443,8 +443,8 @@ test("animate option (queue === false)", function () { $foo.animate({width:"100px"}, 3000, function () { // should finish after unqueued animation so second order.push(2); - deepEqual( order, [ 1, 2 ], "Animations finished in the correct order" ); - start(); + assert.deepEqual( order, [ 1, 2 ], "Animations finished in the correct order" ); + QUnit.start(); }); $foo.animate({fontSize:"2em"}, {queue:false, duration:10, complete:function () { // short duration and out of queue so should finish first @@ -453,8 +453,8 @@ test("animate option (queue === false)", function () { }); */ -test( "animate option { queue: false }", function() { - expect( 2 ); +QUnit.test( "animate option { queue: false }", function( assert ) { + assert.expect( 2 ); var foo = jQuery( "#foo" ); foo.animate( { @@ -463,16 +463,16 @@ test( "animate option { queue: false }", function() { queue: false, duration: 10, complete: function() { - ok( true, "Animation Completed" ); + assert.ok( true, "Animation Completed" ); } } ); this.clock.tick( 10 ); - equal( foo.queue().length, 0, "Queue is empty" ); + assert.equal( foo.queue().length, 0, "Queue is empty" ); } ); -test( "animate option { queue: true }", function() { - expect( 2 ); +QUnit.test( "animate option { queue: true }", function( assert ) { + assert.expect( 2 ); var foo = jQuery( "#foo" ); foo.animate( { @@ -481,18 +481,18 @@ test( "animate option { queue: true }", function() { queue: true, duration: 10, complete: function() { - ok( true, "Animation Completed" ); + assert.ok( true, "Animation Completed" ); } } ); - notEqual( foo.queue().length, 0, "Default queue is not empty" ); + assert.notEqual( foo.queue().length, 0, "Default queue is not empty" ); //clear out existing timers before next test this.clock.tick( 10 ); } ); -test( "animate option { queue: 'name' }", function() { - expect( 5 ); +QUnit.test( "animate option { queue: 'name' }", function( assert ) { + assert.expect( 5 ); var foo = jQuery( "#foo" ), origWidth = parseFloat( foo.css( "width" ) ), order = []; @@ -504,27 +504,27 @@ test( "animate option { queue: 'name' }", function() { // second callback function order.push( 2 ); - equal( parseFloat( foo.css( "width" ) ), origWidth + 100, "Animation ended" ); - equal( foo.queue( "name" ).length, 1, "Queue length of 'name' queue" ); + assert.equal( parseFloat( foo.css( "width" ) ), origWidth + 100, "Animation ended" ); + assert.equal( foo.queue( "name" ).length, 1, "Queue length of 'name' queue" ); } } ).queue( "name", function() { // last callback function - deepEqual( order, [ 1, 2 ], "Callbacks in expected order" ); + assert.deepEqual( order, [ 1, 2 ], "Callbacks in expected order" ); } ); // this is the first callback function that should be called order.push( 1 ); - equal( parseFloat( foo.css( "width" ) ), origWidth, "Animation does not start on its own." ); - equal( foo.queue( "name" ).length, 2, "Queue length of 'name' queue" ); + assert.equal( parseFloat( foo.css( "width" ) ), origWidth, "Animation does not start on its own." ); + assert.equal( foo.queue( "name" ).length, 2, "Queue length of 'name' queue" ); foo.dequeue( "name" ); this.clock.tick( 10 ); } ); -test( "animate with no properties", function() { - expect( 2 ); +QUnit.test( "animate with no properties", function( assert ) { + assert.expect( 2 ); var foo, divs = jQuery( "div" ), @@ -534,74 +534,74 @@ test( "animate with no properties", function() { count++; } ); - equal( divs.length, count, "Make sure that callback is called for each element in the set." ); + assert.equal( divs.length, count, "Make sure that callback is called for each element in the set." ); foo = jQuery( "#foo" ); foo.animate( {} ); foo.animate( { top: 10 }, 100, function() { - ok( true, "Animation was properly dequeued." ); + assert.ok( true, "Animation was properly dequeued." ); } ); this.clock.tick( 100 ); } ); -test( "animate duration 0", function() { - expect( 11 ); +QUnit.test( "animate duration 0", function( assert ) { + assert.expect( 11 ); var $elem, $elems = jQuery( [ { a:0 },{ a:0 } ] ), counter = 0; - equal( jQuery.timers.length, 0, "Make sure no animation was running from another test" ); + assert.equal( jQuery.timers.length, 0, "Make sure no animation was running from another test" ); $elems.eq( 0 ).animate( { a:1 }, 0, function() { - ok( true, "Animate a simple property." ); + assert.ok( true, "Animate a simple property." ); counter++; } ); // Failed until [6115] - equal( jQuery.timers.length, 0, "Make sure synchronic animations are not left on jQuery.timers" ); + assert.equal( jQuery.timers.length, 0, "Make sure synchronic animations are not left on jQuery.timers" ); - equal( counter, 1, "One synchronic animations" ); + assert.equal( counter, 1, "One synchronic animations" ); $elems.animate( { a:2 }, 0, function() { - ok( true, "Animate a second simple property." ); + assert.ok( true, "Animate a second simple property." ); counter++; } ); - equal( counter, 3, "Multiple synchronic animations" ); + assert.equal( counter, 3, "Multiple synchronic animations" ); $elems.eq( 0 ).animate( { a:3 }, 0, function() { - ok( true, "Animate a third simple property." ); + assert.ok( true, "Animate a third simple property." ); counter++; } ); $elems.eq( 1 ).animate( { a:3 }, 200, function() { counter++; // Failed until [6115] - equal( counter, 5, "One synchronic and one asynchronic" ); + assert.equal( counter, 5, "One synchronic and one asynchronic" ); } ); this.clock.tick( 200 ); $elem = jQuery( "<div />" ); $elem.show( 0, function() { - ok( true, "Show callback with no duration" ); + assert.ok( true, "Show callback with no duration" ); } ); $elem.hide( 0, function() { - ok( true, "Hide callback with no duration" ); + assert.ok( true, "Hide callback with no duration" ); } ); // manually clean up detached elements $elem.remove(); } ); -test( "animate hyphenated properties", function() { - expect( 1 ); +QUnit.test( "animate hyphenated properties", function( assert ) { + assert.expect( 1 ); jQuery( "#foo" ) .css( "font-size", 10 ) .animate( { "font-size": 20 }, 200, function() { - equal( this.style.fontSize, "20px", "The font-size property was animated." ); + assert.equal( this.style.fontSize, "20px", "The font-size property was animated." ); } ); // FIXME why is this double only when run with other tests @@ -609,19 +609,19 @@ test( "animate hyphenated properties", function() { } ); -test( "animate non-element", function() { - expect( 1 ); +QUnit.test( "animate non-element", function( assert ) { + assert.expect( 1 ); var obj = { test: 0 }; jQuery( obj ).animate( { test: 200 }, 200, function() { - equal( obj.test, 200, "The custom property should be modified." ); + assert.equal( obj.test, 200, "The custom property should be modified." ); } ); this.clock.tick( 200 ); } ); -test( "stop()", function() { - expect( 4 ); +QUnit.test( "stop()", function( assert ) { + assert.expect( 4 ); var $one, $two, $foo = jQuery( "#foo" ), @@ -633,17 +633,17 @@ test( "stop()", function() { this.clock.tick( 100 ); nw = $foo.css( "width" ); - notEqual( parseFloat( nw ), w, "An animation occurred " + nw + " " + w + "px" ); + assert.notEqual( parseFloat( nw ), w, "An animation occurred " + nw + " " + w + "px" ); $foo.stop(); nw = $foo.css( "width" ); - notEqual( parseFloat( nw ), w, "Stop didn't reset the animation " + nw + " " + w + "px" ); + assert.notEqual( parseFloat( nw ), w, "Stop didn't reset the animation " + nw + " " + w + "px" ); this.clock.tick( 100 ); $foo.removeData(); $foo.removeData( undefined, true ); - equal( nw, $foo.css( "width" ), "The animation didn't continue" ); + assert.equal( nw, $foo.css( "width" ), "The animation didn't continue" ); $one = jQuery( "#fadein" ); $two = jQuery( "#show" ); @@ -652,7 +652,7 @@ test( "stop()", function() { } ); this.clock.tick( 100 ); $two.fadeTo( 100, 0, function() { - equal( $two.css( "opacity" ), "0", "Stop does not interfere with animations on other elements (#6641)" ); + assert.equal( $two.css( "opacity" ), "0", "Stop does not interfere with animations on other elements (#6641)" ); // Reset styles $one.add( $two ).css( "opacity", "" ); @@ -660,8 +660,8 @@ test( "stop()", function() { this.clock.tick( 100 ); } ); -test( "stop() - several in queue", function() { - expect( 5 ); +QUnit.test( "stop() - several in queue", function( assert ) { + assert.expect( 5 ); var nw, $foo = jQuery( "#foo" ); @@ -675,23 +675,23 @@ test( "stop() - several in queue", function() { this.clock.tick( 1 ); jQuery.fx.tick(); - equal( $foo.queue().length, 3, "3 in the queue" ); + assert.equal( $foo.queue().length, 3, "3 in the queue" ); nw = $foo.css( "width" ); - notEqual( parseFloat( nw ), 1, "An animation occurred " + nw ); + assert.notEqual( parseFloat( nw ), 1, "An animation occurred " + nw ); $foo.stop(); - equal( $foo.queue().length, 2, "2 in the queue" ); + assert.equal( $foo.queue().length, 2, "2 in the queue" ); nw = $foo.css( "width" ); - notEqual( parseFloat( nw ), 1, "Stop didn't reset the animation " + nw ); + assert.notEqual( parseFloat( nw ), 1, "Stop didn't reset the animation " + nw ); $foo.stop( true ); - equal( $foo.queue().length, 0, "0 in the queue" ); + assert.equal( $foo.queue().length, 0, "0 in the queue" ); } ); -test( "stop(clearQueue)", function() { - expect( 4 ); +QUnit.test( "stop(clearQueue)", function( assert ) { + assert.expect( 4 ); var $foo = jQuery( "#foo" ), w = 0, @@ -703,19 +703,19 @@ test( "stop(clearQueue)", function() { $foo.animate( { "width": "show" }, 1000 ); this.clock.tick( 100 ); nw = $foo.css( "width" ); - ok( parseFloat( nw ) !== w, "An animation occurred " + nw + " " + w + "px" ); + assert.ok( parseFloat( nw ) !== w, "An animation occurred " + nw + " " + w + "px" ); $foo.stop( true ); nw = $foo.css( "width" ); - ok( parseFloat( nw ) !== w, "Stop didn't reset the animation " + nw + " " + w + "px" ); + assert.ok( parseFloat( nw ) !== w, "Stop didn't reset the animation " + nw + " " + w + "px" ); - equal( $foo.queue().length, 0, "The animation queue was cleared" ); + assert.equal( $foo.queue().length, 0, "The animation queue was cleared" ); this.clock.tick( 100 ); - equal( nw, $foo.css( "width" ), "The animation didn't continue" ); + assert.equal( nw, $foo.css( "width" ), "The animation didn't continue" ); } ); -test( "stop(clearQueue, gotoEnd)", function() { - expect( 1 ); +QUnit.test( "stop(clearQueue, gotoEnd)", function( assert ) { + assert.expect( 1 ); var $foo = jQuery( "#foo" ), w = 0, @@ -728,7 +728,7 @@ test( "stop(clearQueue, gotoEnd)", function() { $foo.animate( { width: "hide" }, 1000 ); this.clock.tick( 100 ); nw = $foo.css( "width" ); - ok( parseFloat( nw ) !== w, "An animation occurred " + nw + " " + w + "px" ); + assert.ok( parseFloat( nw ) !== w, "An animation occurred " + nw + " " + w + "px" ); $foo.stop( false, true ); nw = $foo.css( "width" ); @@ -743,8 +743,8 @@ test( "stop(clearQueue, gotoEnd)", function() { $foo.stop( true ); } ); -test( "stop( queue, ..., ... ) - Stop single queues", function() { - expect( 3 ); +QUnit.test( "stop( queue, ..., ... ) - Stop single queues", function( assert ) { + assert.expect( 3 ); var saved, foo = jQuery( "#foo" ).css( { width: 200, height: 200 } ); @@ -753,8 +753,8 @@ test( "stop( queue, ..., ... ) - Stop single queues", function() { }, { duration: 500, complete: function() { - equal( parseFloat( foo.css( "width" ) ), 400, "Animation completed for standard queue" ); - equal( parseFloat( foo.css( "height" ) ), saved, "Height was not changed after the second stop" ); + assert.equal( parseFloat( foo.css( "width" ) ), 400, "Animation completed for standard queue" ); + assert.equal( parseFloat( foo.css( "height" ) ), saved, "Height was not changed after the second stop" ); } } ); @@ -765,7 +765,7 @@ test( "stop( queue, ..., ... ) - Stop single queues", function() { queue: "height" } ).dequeue( "height" ).stop( "height", false, true ); - equal( parseFloat( foo.css( "height" ) ), 400, "Height was stopped with gotoEnd" ); + assert.equal( parseFloat( foo.css( "height" ) ), 400, "Height was stopped with gotoEnd" ); foo.animate( { height: 200 @@ -777,25 +777,25 @@ test( "stop( queue, ..., ... ) - Stop single queues", function() { this.clock.tick( 500 ); } ); -test( "toggle()", function() { - expect( 6 ); +QUnit.test( "toggle()", function( assert ) { + assert.expect( 6 ); var x = jQuery( "#foo" ); - ok( x.is( ":visible" ), "is visible" ); + assert.ok( x.is( ":visible" ), "is visible" ); x.toggle(); - ok( x.is( ":hidden" ), "is hidden" ); + assert.ok( x.is( ":hidden" ), "is hidden" ); x.toggle(); - ok( x.is( ":visible" ), "is visible again" ); + assert.ok( x.is( ":visible" ), "is visible again" ); x.toggle( true ); - ok( x.is( ":visible" ), "is visible" ); + assert.ok( x.is( ":visible" ), "is visible" ); x.toggle( false ); - ok( x.is( ":hidden" ), "is hidden" ); + assert.ok( x.is( ":hidden" ), "is hidden" ); x.toggle( true ); - ok( x.is( ":visible" ), "is visible again" ); + assert.ok( x.is( ":visible" ), "is visible again" ); } ); -test( "jQuery.fx.prototype.cur() - <1.8 Back Compat", function() { - expect( 7 ); +QUnit.test( "jQuery.fx.prototype.cur() - <1.8 Back Compat", function( assert ) { + assert.expect( 7 ); var div = jQuery( "<div></div>" ).appendTo( "#qunit-fixture" ).css( { color: "#ABC", @@ -804,13 +804,13 @@ test( "jQuery.fx.prototype.cur() - <1.8 Back Compat", function() { marginBottom: "-11000px" } )[ 0 ]; - equal( + assert.equal( ( new jQuery.fx( div, {}, "color" ) ).cur(), jQuery.css( div, "color" ), "Return the same value as jQuery.css for complex properties (bug #7912)" ); - strictEqual( + assert.strictEqual( ( new jQuery.fx( div, {}, "borderLeftWidth" ) ).cur(), 5, "Return simple values parsed as Float" @@ -822,12 +822,12 @@ test( "jQuery.fx.prototype.cur() - <1.8 Back Compat", function() { // value as it is being newed jQuery.cssHooks.backgroundPosition = { get: function() { - ok( true, "hook used" ); + assert.ok( true, "hook used" ); return ""; } }; - strictEqual( + assert.strictEqual( ( new jQuery.fx( div, {}, "backgroundPosition" ) ).cur(), 0, "Return 0 when jQuery.css returns an empty string" @@ -835,13 +835,13 @@ test( "jQuery.fx.prototype.cur() - <1.8 Back Compat", function() { delete jQuery.cssHooks.backgroundPosition; - strictEqual( + assert.strictEqual( ( new jQuery.fx( div, {}, "left" ) ).cur(), 0, "Return 0 when jQuery.css returns 'auto'" ); - equal( + assert.equal( ( new jQuery.fx( div, {}, "marginBottom" ) ).cur(), -11000, "support negative values < -10000 (bug #7193)" @@ -850,8 +850,8 @@ test( "jQuery.fx.prototype.cur() - <1.8 Back Compat", function() { jQuery( div ).remove(); } ); -test( "Overflow and Display", function() { - expect( 4 ); +QUnit.test( "Overflow and Display", function( assert ) { + assert.expect( 4 ); var testClass = jQuery.makeTest( "Overflow and Display" ) @@ -859,8 +859,8 @@ test( "Overflow and Display", function() { testStyle = jQuery.makeTest( "Overflow and Display (inline style)" ) .css( { overflow: "visible", display: "inline" } ), done = function() { - equal( jQuery.css( this, "overflow" ), "visible", "Overflow should be 'visible'" ); - equal( jQuery.css( this, "display" ), "inline", "Display should be 'inline'" ); + assert.equal( jQuery.css( this, "overflow" ), "visible", "Overflow should be 'visible'" ); + assert.equal( jQuery.css( this, "display" ), "inline", "Display should be 'inline'" ); }; testClass.add( testStyle ) @@ -929,7 +929,7 @@ jQuery.each( { return 0; } }, function( tn, t ) { - test( fn + " to " + tn, function() { + QUnit.test( fn + " to " + tn, function( assert ) { var num, anim, elem = jQuery.makeTest( fn + " to " + tn ), t_w = t( elem, "width" ), @@ -956,7 +956,7 @@ jQuery.each( { if ( t_w.constructor === Number ) { num += 2; } if ( t_h.constructor === Number ) { num += 2; } - expect( num ); + assert.expect( num ); anim = { width: t_w, height: t_h, opacity: t_o }; @@ -967,16 +967,16 @@ jQuery.each( { elem = $elem[ 0 ]; if ( t_w === "show" ) { - equal( $elem.css( "display" ), "block", + assert.equal( $elem.css( "display" ), "block", "Showing, display should block: " + elem.style.display ); } if ( t_w === "hide" || t_w === "show" ) { - ok( f_w === "" ? elem.style.width === f_w : elem.style.width.indexOf( f_w ) === 0, "Width must be reset to " + f_w + ": " + elem.style.width ); + assert.ok( f_w === "" ? elem.style.width === f_w : elem.style.width.indexOf( f_w ) === 0, "Width must be reset to " + f_w + ": " + elem.style.width ); } if ( t_h === "hide" || t_h === "show" ) { - ok( f_h === "" ? elem.style.height === f_h : elem.style.height.indexOf( f_h ) === 0, "Height must be reset to " + f_h + ": " + elem.style.height ); + assert.ok( f_h === "" ? elem.style.height === f_h : elem.style.height.indexOf( f_h ) === 0, "Height must be reset to " + f_h + ": " + elem.style.height ); } cur_o = jQuery.style( elem, "opacity" ); @@ -997,33 +997,33 @@ jQuery.each( { } if ( t_o === "hide" || t_o === "show" ) { - equal( cur_o, f_o, "Opacity must be reset to " + f_o + ": " + cur_o ); + assert.equal( cur_o, f_o, "Opacity must be reset to " + f_o + ": " + cur_o ); } if ( t_w === "hide" ) { - equal( elem.style.display, "none", "Hiding, display should be none: " + elem.style.display ); + assert.equal( elem.style.display, "none", "Hiding, display should be none: " + elem.style.display ); } if ( t_o.constructor === Number ) { - equal( cur_o, t_o, "Final opacity should be " + t_o + ": " + cur_o ); + assert.equal( cur_o, t_o, "Final opacity should be " + t_o + ": " + cur_o ); - ok( jQuery.css( elem, "opacity" ) !== "" || cur_o === t_o, "Opacity should be explicitly set to " + t_o + ", is instead: " + cur_o ); + assert.ok( jQuery.css( elem, "opacity" ) !== "" || cur_o === t_o, "Opacity should be explicitly set to " + t_o + ", is instead: " + cur_o ); } if ( t_w.constructor === Number ) { - equal( elem.style.width, t_w + "px", "Final width should be " + t_w + ": " + elem.style.width ); + assert.equal( elem.style.width, t_w + "px", "Final width should be " + t_w + ": " + elem.style.width ); cur_w = jQuery.css( elem, "width" ); - ok( elem.style.width !== "" || cur_w === t_w, "Width should be explicitly set to " + t_w + ", is instead: " + cur_w ); + assert.ok( elem.style.width !== "" || cur_w === t_w, "Width should be explicitly set to " + t_w + ", is instead: " + cur_w ); } if ( t_h.constructor === Number ) { - equal( elem.style.height, t_h + "px", "Final height should be " + t_h + ": " + elem.style.height ); + assert.equal( elem.style.height, t_h + "px", "Final height should be " + t_h + ": " + elem.style.height ); cur_h = jQuery.css( elem, "height" ); - ok( elem.style.height !== "" || cur_h === t_h, "Height should be explicitly set to " + t_h + ", is instead: " + cur_h ); + assert.ok( elem.style.height !== "" || cur_h === t_h, "Height should be explicitly set to " + t_h + ", is instead: " + cur_h ); } if ( t_h === "show" ) { @@ -1031,9 +1031,9 @@ jQuery.each( { jQuery( elem ).append( "<br/>Some more text<br/>and some more..." ); if ( /Auto/.test( fn ) ) { - notEqual( jQuery.css( elem, "height" ), old_h, "Make sure height is auto." ); + assert.notEqual( jQuery.css( elem, "height" ), old_h, "Make sure height is auto." ); } else { - equal( jQuery.css( elem, "height" ), old_h, "Make sure height is not auto." ); + assert.equal( jQuery.css( elem, "height" ), old_h, "Make sure height is not auto." ); } } @@ -1046,19 +1046,19 @@ jQuery.each( { } ); } ); -test( "Effects chaining", function() { +QUnit.test( "Effects chaining", function( assert ) { var remaining = 16, props = [ "opacity", "height", "width", "display", "overflow" ], setup = function( name, selector ) { var $el = jQuery( selector ); return $el.data( getProps( $el[ 0 ] ) ).data( "name", name ); }, - assert = function() { + check = function() { var data = jQuery.data( this ), name = data.name; delete data.name; - deepEqual( getProps( this ), data, name ); + assert.deepEqual( getProps( this ), data, name ); jQuery.removeData( this ); }, @@ -1070,24 +1070,24 @@ test( "Effects chaining", function() { return obj; }; - expect( remaining ); - - setup( ".fadeOut().fadeIn()", "#fadein div" ).fadeOut( "fast" ).fadeIn( "fast", assert ); - setup( ".fadeIn().fadeOut()", "#fadeout div" ).fadeIn( "fast" ).fadeOut( "fast", assert ); - setup( ".hide().show()", "#show div" ).hide( "fast" ).show( "fast", assert ); - setup( ".show().hide()", "#hide div" ).show( "fast" ).hide( "fast", assert ); - setup( ".show().hide(easing)", "#easehide div" ).show( "fast" ).hide( "fast", "linear", assert ); - setup( ".toggle().toggle() - in", "#togglein div" ).toggle( "fast" ).toggle( "fast", assert ); - setup( ".toggle().toggle() - out", "#toggleout div" ).toggle( "fast" ).toggle( "fast", assert ); - setup( ".toggle().toggle(easing) - out", "#easetoggleout div" ).toggle( "fast" ).toggle( "fast", "linear", assert ); - setup( ".slideDown().slideUp()", "#slidedown div" ).slideDown( "fast" ).slideUp( "fast", assert ); - setup( ".slideUp().slideDown()", "#slideup div" ).slideUp( "fast" ).slideDown( "fast", assert ); - setup( ".slideUp().slideDown(easing)", "#easeslideup div" ).slideUp( "fast" ).slideDown( "fast", "linear", assert ); - setup( ".slideToggle().slideToggle() - in", "#slidetogglein div" ).slideToggle( "fast" ).slideToggle( "fast", assert ); - setup( ".slideToggle().slideToggle() - out", "#slidetoggleout div" ).slideToggle( "fast" ).slideToggle( "fast", assert ); - setup( ".fadeToggle().fadeToggle() - in", "#fadetogglein div" ).fadeToggle( "fast" ).fadeToggle( "fast", assert ); - setup( ".fadeToggle().fadeToggle() - out", "#fadetoggleout div" ).fadeToggle( "fast" ).fadeToggle( "fast", assert ); - setup( ".fadeTo(0.5).fadeTo(1.0, easing)", "#fadeto div" ).fadeTo( "fast", 0.5 ).fadeTo( "fast", 1.0, "linear", assert ); + assert.expect( remaining ); + + setup( ".fadeOut().fadeIn()", "#fadein div" ).fadeOut( "fast" ).fadeIn( "fast", check ); + setup( ".fadeIn().fadeOut()", "#fadeout div" ).fadeIn( "fast" ).fadeOut( "fast", check ); + setup( ".hide().show()", "#show div" ).hide( "fast" ).show( "fast", check ); + setup( ".show().hide()", "#hide div" ).show( "fast" ).hide( "fast", check ); + setup( ".show().hide(easing)", "#easehide div" ).show( "fast" ).hide( "fast", "linear", check ); + setup( ".toggle().toggle() - in", "#togglein div" ).toggle( "fast" ).toggle( "fast", check ); + setup( ".toggle().toggle() - out", "#toggleout div" ).toggle( "fast" ).toggle( "fast", check ); + setup( ".toggle().toggle(easing) - out", "#easetoggleout div" ).toggle( "fast" ).toggle( "fast", "linear", check ); + setup( ".slideDown().slideUp()", "#slidedown div" ).slideDown( "fast" ).slideUp( "fast", check ); + setup( ".slideUp().slideDown()", "#slideup div" ).slideUp( "fast" ).slideDown( "fast", check ); + setup( ".slideUp().slideDown(easing)", "#easeslideup div" ).slideUp( "fast" ).slideDown( "fast", "linear", check ); + setup( ".slideToggle().slideToggle() - in", "#slidetogglein div" ).slideToggle( "fast" ).slideToggle( "fast", check ); + setup( ".slideToggle().slideToggle() - out", "#slidetoggleout div" ).slideToggle( "fast" ).slideToggle( "fast", check ); + setup( ".fadeToggle().fadeToggle() - in", "#fadetogglein div" ).fadeToggle( "fast" ).fadeToggle( "fast", check ); + setup( ".fadeToggle().fadeToggle() - out", "#fadetoggleout div" ).fadeToggle( "fast" ).fadeToggle( "fast", check ); + setup( ".fadeTo(0.5).fadeTo(1.0, easing)", "#fadeto div" ).fadeTo( "fast", 0.5 ).fadeTo( "fast", 1.0, "linear", check ); this.clock.tick( 400 ); } ); @@ -1106,21 +1106,21 @@ jQuery.makeTest = function( text ) { jQuery.makeTest.id = 1; -test( "jQuery.show('fast') doesn't clear radio buttons (bug #1095)", function() { - expect( 4 ); +QUnit.test( "jQuery.show('fast') doesn't clear radio buttons (bug #1095)", function( assert ) { + assert.expect( 4 ); var $checkedtest = jQuery( "#checkedtest" ); $checkedtest.hide().show( "fast", function() { - ok( jQuery( "input[type='radio']", $checkedtest ).first().attr( "checked" ), "Check first radio still checked." ); - ok( !jQuery( "input[type='radio']", $checkedtest ).last().attr( "checked" ), "Check last radio still NOT checked." ); - ok( jQuery( "input[type='checkbox']", $checkedtest ).first().attr( "checked" ), "Check first checkbox still checked." ); - ok( !jQuery( "input[type='checkbox']", $checkedtest ).last().attr( "checked" ), "Check last checkbox still NOT checked." ); + assert.ok( jQuery( "input[type='radio']", $checkedtest ).first().attr( "checked" ), "Check first radio still checked." ); + assert.ok( !jQuery( "input[type='radio']", $checkedtest ).last().attr( "checked" ), "Check last radio still NOT checked." ); + assert.ok( jQuery( "input[type='checkbox']", $checkedtest ).first().attr( "checked" ), "Check first checkbox still checked." ); + assert.ok( !jQuery( "input[type='checkbox']", $checkedtest ).last().attr( "checked" ), "Check last checkbox still NOT checked." ); } ); this.clock.tick( 200 ); } ); -test( "interrupt toggle", function() { - expect( 24 ); +QUnit.test( "interrupt toggle", function( assert ) { + assert.expect( 24 ); var env = this, longDuration = 2000, @@ -1148,7 +1148,7 @@ test( "interrupt toggle", function() { $methodElems[ method ]( longDuration ); setTimeout( function() { $methodElems.stop().each( function() { - notEqual( jQuery( this ).css( prop ), jQuery.data( this, "startVal" ), ".stop() before completion of hiding ." + method + "() - #" + this.id ); + assert.notEqual( jQuery( this ).css( prop ), jQuery.data( this, "startVal" ), ".stop() before completion of hiding ." + method + "() - #" + this.id ); } ); // Restore @@ -1159,17 +1159,17 @@ test( "interrupt toggle", function() { $elem.removeData( "startVal" ); - equal( $elem.css( prop ), startVal, "original value restored by ." + method + "() - #" + id ); + assert.equal( $elem.css( prop ), startVal, "original value restored by ." + method + "() - #" + id ); // Interrupt a showing toggle $elem.hide()[ method ]( longDuration ); setTimeout( function() { $elem.stop(); - notEqual( $elem.css( prop ), startVal, ".stop() before completion of showing ." + method + "() - #" + id ); + assert.notEqual( $elem.css( prop ), startVal, ".stop() before completion of showing ." + method + "() - #" + id ); // Restore $elem[ method ]( shortDuration, function() { - equal( $elem.css( prop ), startVal, "original value restored by ." + method + "() - #" + id ); + assert.equal( $elem.css( prop ), startVal, "original value restored by ." + method + "() - #" + id ); finish(); } ); }, shortDuration ); @@ -1181,9 +1181,9 @@ test( "interrupt toggle", function() { // FIXME untangle the set timeouts } ); -test( "animate with per-property easing", function() { +QUnit.test( "animate with per-property easing", function( assert ) { - expect( 5 ); + assert.expect( 5 ); var data = { a: 0, b: 0, c: 0 }, test1Called = false, @@ -1211,18 +1211,18 @@ test( "animate with per-property easing", function() { }; jQuery( data ).animate( props, 400, "_defaultTest", function() { - ok( test1Called, "Easing function (_test1) called" ); - ok( test2Called, "Easing function (_test2) called" ); - ok( defaultTestCalled, "Easing function (_default) called" ); - equal( props.a[ 1 ], "_test1", "animate does not change original props (per-property easing would be lost)" ); - equal( props.b[ 1 ], "_test2", "animate does not change original props (per-property easing would be lost)" ); + assert.ok( test1Called, "Easing function (_test1) called" ); + assert.ok( test2Called, "Easing function (_test2) called" ); + assert.ok( defaultTestCalled, "Easing function (_default) called" ); + assert.equal( props.a[ 1 ], "_test1", "animate does not change original props (per-property easing would be lost)" ); + assert.equal( props.b[ 1 ], "_test2", "animate does not change original props (per-property easing would be lost)" ); } ); this.clock.tick( 400 ); } ); -test( "animate with CSS shorthand properties", function() { - expect( 11 ); +QUnit.test( "animate with CSS shorthand properties", function( assert ) { + assert.expect( 11 ); var easeAnimation_count = 0, easeProperty_count = 0, @@ -1245,20 +1245,20 @@ test( "animate with CSS shorthand properties", function() { jQuery( "#foo" ) .animate( propsBasic, 200, "animationScope", function() { - equal( this.style.paddingTop, "10px", "padding-top was animated" ); - equal( this.style.paddingLeft, "20px", "padding-left was animated" ); - equal( this.style.paddingRight, "20px", "padding-right was animated" ); - equal( this.style.paddingBottom, "30px", "padding-bottom was animated" ); - equal( easeAnimation_count, 4, "per-animation default easing called for each property" ); + assert.equal( this.style.paddingTop, "10px", "padding-top was animated" ); + assert.equal( this.style.paddingLeft, "20px", "padding-left was animated" ); + assert.equal( this.style.paddingRight, "20px", "padding-right was animated" ); + assert.equal( this.style.paddingBottom, "30px", "padding-bottom was animated" ); + assert.equal( easeAnimation_count, 4, "per-animation default easing called for each property" ); easeAnimation_count = 0; } ) .animate( propsSpecial, 200, "animationScope", function() { - equal( this.style.paddingTop, "1px", "padding-top was animated again" ); - equal( this.style.paddingLeft, "2px", "padding-left was animated again" ); - equal( this.style.paddingRight, "2px", "padding-right was animated again" ); - equal( this.style.paddingBottom, "3px", "padding-bottom was animated again" ); - equal( easeAnimation_count, 0, "per-animation default easing not called" ); - equal( easeProperty_count, 4, "special easing called for each property" ); + assert.equal( this.style.paddingTop, "1px", "padding-top was animated again" ); + assert.equal( this.style.paddingLeft, "2px", "padding-left was animated again" ); + assert.equal( this.style.paddingRight, "2px", "padding-right was animated again" ); + assert.equal( this.style.paddingBottom, "3px", "padding-bottom was animated again" ); + assert.equal( easeAnimation_count, 0, "per-animation default easing not called" ); + assert.equal( easeProperty_count, 4, "special easing called for each property" ); jQuery( this ).css( "padding", "0" ); delete jQuery.easing.animationScope; @@ -1267,43 +1267,43 @@ test( "animate with CSS shorthand properties", function() { this.clock.tick( 400 ); } ); -test( "hide hidden elements, with animation (bug #7141)", function() { - expect( 3 ); +QUnit.test( "hide hidden elements, with animation (bug #7141)", function( assert ) { + assert.expect( 3 ); var div = jQuery( "<div style='display:none'></div>" ).appendTo( "#qunit-fixture" ); - equal( div.css( "display" ), "none", "Element is hidden by default" ); + assert.equal( div.css( "display" ), "none", "Element is hidden by default" ); div.hide( 1, function() { - ok( !jQuery._data( div, "display" ), "display data is undefined after hiding an already-hidden element" ); + assert.ok( !jQuery._data( div, "display" ), "display data is undefined after hiding an already-hidden element" ); div.show( 1, function() { - equal( div.css( "display" ), "block", "Show a double-hidden element" ); + assert.equal( div.css( "display" ), "block", "Show a double-hidden element" ); } ); } ); this.clock.tick( 10 ); } ); -test( "animate unit-less properties (#4966)", function() { - expect( 2 ); +QUnit.test( "animate unit-less properties (#4966)", function( assert ) { + assert.expect( 2 ); var div = jQuery( "<div style='z-index: 0; position: absolute;'></div>" ).appendTo( "#qunit-fixture" ); - equal( div.css( "z-index" ), "0", "z-index is 0" ); + assert.equal( div.css( "z-index" ), "0", "z-index is 0" ); div.animate( { zIndex: 2 }, function() { - equal( div.css( "z-index" ), "2", "z-index is 2" ); + assert.equal( div.css( "z-index" ), "2", "z-index is 2" ); } ); this.clock.tick( 400 ); } ); -test( "animate properties missing px w/ opacity as last (#9074)", function() { - expect( 2 ); +QUnit.test( "animate properties missing px w/ opacity as last (#9074)", function( assert ) { + assert.expect( 2 ); - expect( 6 ); + assert.expect( 6 ); var ml, l, div = jQuery( "<div style='position: absolute; margin-left: 0; left: 0px;'></div>" ) .appendTo( "#qunit-fixture" ); function cssInt( prop ) { return parseInt( div.css( prop ), 10 ); } - equal( cssInt( "marginLeft" ), 0, "Margin left is 0" ); - equal( cssInt( "left" ), 0, "Left is 0" ); + assert.equal( cssInt( "marginLeft" ), 0, "Margin left is 0" ); + assert.equal( cssInt( "left" ), 0, "Left is 0" ); div.animate( { left: 200, marginLeft: 200, @@ -1314,15 +1314,15 @@ test( "animate properties missing px w/ opacity as last (#9074)", function() { ml = cssInt( "marginLeft" ); l = cssInt( "left" ); - notEqual( ml, 0, "Margin left is not 0 after partial animate" ); - notEqual( ml, 200, "Margin left is not 200 after partial animate" ); - notEqual( l, 0, "Left is not 0 after partial animate" ); - notEqual( l, 200, "Left is not 200 after partial animate" ); + assert.notEqual( ml, 0, "Margin left is not 0 after partial animate" ); + assert.notEqual( ml, 200, "Margin left is not 200 after partial animate" ); + assert.notEqual( l, 0, "Left is not 0 after partial animate" ); + assert.notEqual( l, 200, "Left is not 200 after partial animate" ); div.stop().remove(); } ); -test( "callbacks should fire in correct order (#9100)", function() { - expect( 1 ); +QUnit.test( "callbacks should fire in correct order (#9100)", function( assert ) { + assert.expect( 1 ); var a = 1, cb = 0; @@ -1335,14 +1335,14 @@ test( "callbacks should fire in correct order (#9100)", function() { a *= jQuery( this ).data( "operation" ) === "*2" ? 2 : a; cb++; if ( cb === 2 ) { - equal( a, 4, "test value has been *2 and _then_ ^2" ); + assert.equal( a, 4, "test value has been *2 and _then_ ^2" ); } } ); this.clock.tick( 20 ); } ); -test( "callbacks that throw exceptions will be removed (#5684)", function() { - expect( 2 ); +QUnit.test( "callbacks that throw exceptions will be removed (#5684)", function( assert ) { + assert.expect( 2 ); var foo = jQuery( "#foo" ); @@ -1360,30 +1360,30 @@ test( "callbacks that throw exceptions will be removed (#5684)", function() { jQuery.fx.stop(); this.clock.tick( 1 ); - throws( jQuery.fx.tick, TestException, "Exception was thrown" ); + assert.throws( jQuery.fx.tick, TestException, "Exception was thrown" ); // the second call shouldn't jQuery.fx.tick(); - ok( true, "Test completed without throwing a second exception" ); + assert.ok( true, "Test completed without throwing a second exception" ); } ); -test( "animate will scale margin properties individually", function() { - expect( 2 ); +QUnit.test( "animate will scale margin properties individually", function( assert ) { + assert.expect( 2 ); var foo = jQuery( "#foo" ).css( { "margin": 0, "marginLeft": 100 } ); - ok( foo.css( "marginLeft" ) !== foo.css( "marginRight" ), "Sanity Check" ); + assert.ok( foo.css( "marginLeft" ) !== foo.css( "marginRight" ), "Sanity Check" ); foo.animate( { "margin": 200 } ).stop(); - ok( foo.css( "marginLeft" ) !== foo.css( "marginRight" ), "The margin properties are different" ); + assert.ok( foo.css( "marginLeft" ) !== foo.css( "marginRight" ), "The margin properties are different" ); // clean up for next test foo.css( { @@ -1394,8 +1394,8 @@ test( "animate will scale margin properties individually", function() { } ); } ); -test( "Do not append px to 'fill-opacity' #9548", function() { - expect( 1 ); +QUnit.test( "Do not append px to 'fill-opacity' #9548", function( assert ) { + assert.expect( 1 ); var $div = jQuery( "<div>" ).appendTo( "#qunit-fixture" ); @@ -1403,16 +1403,16 @@ test( "Do not append px to 'fill-opacity' #9548", function() { // Support: Android 2.3 (no support for fill-opacity) if ( jQuery( this ).css( "fill-opacity" ) ) { - equal( jQuery( this ).css( "fill-opacity" ), 1, "Do not append px to 'fill-opacity'" ); + assert.equal( jQuery( this ).css( "fill-opacity" ), 1, "Do not append px to 'fill-opacity'" ); } else { - ok( true, "No support for fill-opacity CSS property" ); + assert.ok( true, "No support for fill-opacity CSS property" ); } $div.remove(); } ); } ); -test( "line-height animates correctly (#13855)", function() { - expect( 12 ); +QUnit.test( "line-height animates correctly (#13855)", function( assert ) { + assert.expect( 12 ); var t0, clock = this.clock, @@ -1443,9 +1443,9 @@ test( "line-height animates correctly (#13855)", function() { initial = initialHeight[ i ], height = jQuery( this ).height(), lower = initial * ( 1 - progress ) / tolerance; - ok( height < initial, "hide " + label + ": upper bound; " + + assert.ok( height < initial, "hide " + label + ": upper bound; " + height + " < " + initial + " @ " + ( progress * 100 ) + "%" ); - ok( height > lower, "hide " + label + ": lower bound; " + + assert.ok( height > lower, "hide " + label + ": lower bound; " + height + " > " + lower + " @ " + ( progress * 100 ) + "%" ); } ); @@ -1461,7 +1461,7 @@ test( "line-height animates correctly (#13855)", function() { initial = initialHeight[ i ], height = jQuery( this ).height(), upper = initial * progress * tolerance; - ok( height < upper, "show " + label + ": upper bound; " + + assert.ok( height < upper, "show " + label + ": upper bound; " + height + " < " + upper + " @ " + ( progress * 100 ) + "%" ); } ); @@ -1475,8 +1475,8 @@ clock.tick( 50 ); } ); // Start 1.8 Animation tests -test( "jQuery.Animation( object, props, opts )", function() { - expect( 4 ); +QUnit.test( "jQuery.Animation( object, props, opts )", function( assert ) { + assert.expect( 4 ); var animation, testObject = { @@ -1493,17 +1493,17 @@ test( "jQuery.Animation( object, props, opts )", function() { animation = jQuery.Animation( testObject, testDest, { "duration": 1 } ); animation.done( function() { for ( var prop in testDest ) { - equal( testObject[ prop ], testDest[ prop ], "Animated: " + prop ); + assert.equal( testObject[ prop ], testDest[ prop ], "Animated: " + prop ); } animation.done( function() { - deepEqual( testObject, testDest, "No unexpected properties" ); + assert.deepEqual( testObject, testDest, "No unexpected properties" ); } ); } ); this.clock.tick( 10 ); } ); -test( "Animate Option: step: function( percent, tween )", function() { - expect( 1 ); +QUnit.test( "Animate Option: step: function( percent, tween )", function( assert ) { + assert.expect( 1 ); var counter = {}; jQuery( "#foo" ).animate( { @@ -1520,7 +1520,7 @@ test( "Animate Option: step: function( percent, tween )", function() { calls[ value === 0 ? 0 : 1 ] = value; } } ).queue( function( next ) { - deepEqual( counter, { + assert.deepEqual( counter, { prop1: [ 0, 1 ], prop2: [ 0, 2 ], prop3: [ 0, 3 ] @@ -1530,41 +1530,41 @@ test( "Animate Option: step: function( percent, tween )", function() { this.clock.tick( 10 ); } ); -test( "Animate callbacks have correct context", function() { - expect( 2 ); +QUnit.test( "Animate callbacks have correct context", function( assert ) { + assert.expect( 2 ); var foo = jQuery( "#foo" ); foo.animate( { height: 10 }, 10, function() { - equal( foo[ 0 ], this, "Complete callback after stop(true) `this` is element" ); + assert.equal( foo[ 0 ], this, "Complete callback after stop(true) `this` is element" ); } ).stop( true, true ); foo.animate( { height: 100 }, 10, function() { - equal( foo[ 0 ], this, "Complete callback `this` is element" ); + assert.equal( foo[ 0 ], this, "Complete callback `this` is element" ); } ); this.clock.tick( 10 ); } ); -test( "User supplied callback called after show when fx off (#8892)", function() { - expect( 2 ); +QUnit.test( "User supplied callback called after show when fx off (#8892)", function( assert ) { + assert.expect( 2 ); var foo = jQuery( "#foo" ); jQuery.fx.off = true; foo.hide(); foo.fadeIn( 500, function() { - ok( jQuery( this ).is( ":visible" ), "Element is visible in callback" ); + assert.ok( jQuery( this ).is( ":visible" ), "Element is visible in callback" ); foo.fadeOut( 500, function() { - ok( jQuery( this ).is( ":hidden" ), "Element is hidden in callback" ); + assert.ok( jQuery( this ).is( ":hidden" ), "Element is hidden in callback" ); jQuery.fx.off = false; } ); } ); this.clock.tick( 1000 ); } ); -test( "animate should set display for disconnected nodes", function() { - expect( 20 ); +QUnit.test( "animate should set display for disconnected nodes", function( assert ) { + assert.expect( 20 ); var methods = { toggle: [ 1 ], @@ -1583,47 +1583,47 @@ test( "animate should set display for disconnected nodes", function() { underFragmentDisplay = $divTest.css( "display" ), clock = this.clock; - strictEqual( $divEmpty[ 0 ].parentNode, null, "Setup: element with null parentNode" ); - strictEqual( ( $divTest[ 0 ].parentNode || {} ).nodeType, 11, "Setup: element under fragment" ); + assert.strictEqual( $divEmpty[ 0 ].parentNode, null, "Setup: element with null parentNode" ); + assert.strictEqual( ( $divTest[ 0 ].parentNode || {} ).nodeType, 11, "Setup: element under fragment" ); - strictEqual( $divEmpty.show()[ 0 ].style.display, "", + assert.strictEqual( $divEmpty.show()[ 0 ].style.display, "", "set display with show() for element with null parentNode" ); - strictEqual( $divTest.show()[ 0 ].style.display, "", + assert.strictEqual( $divTest.show()[ 0 ].style.display, "", "set display with show() for element under fragment" ); - strictEqual( $divNone.show()[ 0 ].style.display, "", + assert.strictEqual( $divNone.show()[ 0 ].style.display, "", "show() should change display if it already set to none" ); - strictEqual( $divInline.show()[ 0 ].style.display, "inline", + assert.strictEqual( $divInline.show()[ 0 ].style.display, "inline", "show() should not change display if it already set" ); jQuery.each( methods, function( name, opt ) { jQuery.fn[ name ].apply( jQuery( "<div/>" ), opt.concat( [ function() { - strictEqual( jQuery( this ).css( "display" ), nullParentDisplay, + assert.strictEqual( jQuery( this ).css( "display" ), nullParentDisplay, "." + name + " block with null parentNode" ); } ] ) ); jQuery.fn[ name ].apply( jQuery( "<div>test</div>" ), opt.concat( [ function() { - strictEqual( jQuery( this ).css( "display" ), underFragmentDisplay, + assert.strictEqual( jQuery( this ).css( "display" ), underFragmentDisplay, "." + name + " block under fragment" ); } ] ) ); } ); clock.tick( 400 ); } ); -test( "Animation callback should not show animated element as :animated (#7157)", function() { - expect( 1 ); +QUnit.test( "Animation callback should not show animated element as :animated (#7157)", function( assert ) { + assert.expect( 1 ); var foo = jQuery( "#foo" ); foo.animate( { opacity: 0 }, 100, function() { - ok( !foo.is( ":animated" ), "The element is not animated" ); + assert.ok( !foo.is( ":animated" ), "The element is not animated" ); } ); this.clock.tick( 100 ); } ); -test( "Initial step callback should show element as :animated (#14623)", function() { - expect( 1 ); +QUnit.test( "Initial step callback should show element as :animated (#14623)", function( assert ) { + assert.expect( 1 ); var foo = jQuery( "#foo" ); @@ -1632,15 +1632,15 @@ test( "Initial step callback should show element as :animated (#14623)", functio }, { duration: 100, step: function() { - ok( foo.is( ":animated" ), "The element matches :animated inside step function" ); + assert.ok( foo.is( ":animated" ), "The element matches :animated inside step function" ); } } ); this.clock.tick( 1 ); foo.stop(); } ); -test( "hide called on element within hidden parent should set display to none (#10045)", function() { - expect( 3 ); +QUnit.test( "hide called on element within hidden parent should set display to none (#10045)", function( assert ) { + assert.expect( 3 ); var hidden = jQuery( ".hidden" ), elems = jQuery( "<div>hide</div><div>hide0</div><div>hide1</div>" ); @@ -1652,17 +1652,17 @@ test( "hide called on element within hidden parent should set display to none (# elems.eq( 1 ).hide( 0 ), elems.eq( 2 ).hide( 1 ) ).done( function() { - strictEqual( elems.get( 0 ).style.display, "none", "hide() called on element within hidden parent should set display to none" ); - strictEqual( elems.get( 1 ).style.display, "none", "hide( 0 ) called on element within hidden parent should set display to none" ); - strictEqual( elems.get( 2 ).style.display, "none", "hide( 1 ) called on element within hidden parent should set display to none" ); + assert.strictEqual( elems.get( 0 ).style.display, "none", "hide() called on element within hidden parent should set display to none" ); + assert.strictEqual( elems.get( 1 ).style.display, "none", "hide( 0 ) called on element within hidden parent should set display to none" ); + assert.strictEqual( elems.get( 2 ).style.display, "none", "hide( 1 ) called on element within hidden parent should set display to none" ); elems.remove(); } ); this.clock.tick( 10 ); } ); -test( "hide, fadeOut and slideUp called on element width height and width = 0 should set display to none", function() { - expect( 5 ); +QUnit.test( "hide, fadeOut and slideUp called on element width height and width = 0 should set display to none", function( assert ) { + assert.expect( 5 ); var foo = jQuery( "#foo" ), i = 0, @@ -1681,34 +1681,34 @@ test( "hide, fadeOut and slideUp called on element width height and width = 0 sh elems.eq( 3 ).fadeOut(), elems.eq( 4 ).slideUp() ).done( function() { - strictEqual( elems.get( 0 ).style.display, "none", "hide() called on element width height and width = 0 should set display to none" ); - strictEqual( elems.get( 1 ).style.display, "none", + assert.strictEqual( elems.get( 0 ).style.display, "none", "hide() called on element width height and width = 0 should set display to none" ); + assert.strictEqual( elems.get( 1 ).style.display, "none", "hide( jQuery.noop ) called on element width height and width = 0 should set display to none" ); - strictEqual( elems.get( 2 ).style.display, "none", "hide( 1 ) called on element width height and width = 0 should set display to none" ); - strictEqual( elems.get( 3 ).style.display, "none", "fadeOut() called on element width height and width = 0 should set display to none" ); - strictEqual( elems.get( 4 ).style.display, "none", "slideUp() called on element width height and width = 0 should set display to none" ); + assert.strictEqual( elems.get( 2 ).style.display, "none", "hide( 1 ) called on element width height and width = 0 should set display to none" ); + assert.strictEqual( elems.get( 3 ).style.display, "none", "fadeOut() called on element width height and width = 0 should set display to none" ); + assert.strictEqual( elems.get( 4 ).style.display, "none", "slideUp() called on element width height and width = 0 should set display to none" ); } ); this.clock.tick( 400 ); } ); -test( "hide should not leave hidden inline elements visible (#14848)", function() { - expect( 2 ); +QUnit.test( "hide should not leave hidden inline elements visible (#14848)", function( assert ) { + assert.expect( 2 ); var el = jQuery( "#simon1" ); el.hide( 1, function() { - equal( el.css( "display" ), "none", "hidden" ); + assert.equal( el.css( "display" ), "none", "hidden" ); el.hide( 1, function() { - equal( el.css( "display" ), "none", "still hidden" ); + assert.equal( el.css( "display" ), "none", "still hidden" ); } ); } ); this.clock.tick( 100 ); } ); -test( "Handle queue:false promises", function() { - expect( 10 ); +QUnit.test( "Handle queue:false promises", function( assert ) { + assert.expect( 10 ); var foo = jQuery( "#foo" ).clone().addBack(), step = 1; @@ -1719,14 +1719,14 @@ test( "Handle queue:false promises", function() { duration: 10, queue: false, complete: function() { - ok( step++ <= 2, "Step one or two" ); + assert.ok( step++ <= 2, "Step one or two" ); } } ).animate( { bottom: 1 }, { duration: 10, complete: function() { - ok( step > 2 && step < 5, "Step three or four" ); + assert.ok( step > 2 && step < 5, "Step three or four" ); step++; } } ); @@ -1734,13 +1734,13 @@ test( "Handle queue:false promises", function() { this.clock.tick( 10 ); foo.promise().done( function() { - equal( step++, 5, "steps 1-5: queue:false then queue:fx done" ); + assert.equal( step++, 5, "steps 1-5: queue:false then queue:fx done" ); foo.animate( { top: 10 }, { duration: 10, complete: function() { - ok( step > 5 && step < 8, "Step six or seven" ); + assert.ok( step > 5 && step < 8, "Step six or seven" ); step++; } } ).animate( { @@ -1749,19 +1749,19 @@ test( "Handle queue:false promises", function() { duration: 10, queue: false, complete: function() { - ok( step > 7 && step < 10, "Step eight or nine" ); + assert.ok( step > 7 && step < 10, "Step eight or nine" ); step++; } } ).promise().done( function() { - equal( step++, 10, "steps 6-10: queue:fx then queue:false" ); + assert.equal( step++, 10, "steps 6-10: queue:fx then queue:false" ); } ); } ); this.clock.tick( 10 ); } ); -test( "multiple unqueued and promise", function() { - expect( 4 ); +QUnit.test( "multiple unqueued and promise", function( assert ) { + assert.expect( 4 ); var foo = jQuery( "#foo" ), step = 1; @@ -1771,7 +1771,7 @@ test( "multiple unqueued and promise", function() { duration: 500, queue: false, complete: function() { - strictEqual( step++, 2, "Step 2" ); + assert.strictEqual( step++, 2, "Step 2" ); } } ).animate( { top: 100 @@ -1779,7 +1779,7 @@ test( "multiple unqueued and promise", function() { duration: 1000, queue: false, complete: function() { - strictEqual( step++, 3, "Step 3" ); + assert.strictEqual( step++, 3, "Step 3" ); } } ).animate( {}, { duration: 2000, @@ -1787,16 +1787,16 @@ test( "multiple unqueued and promise", function() { complete: function() { // no properties is a non-op and finishes immediately - strictEqual( step++, 1, "Step 1" ); + assert.strictEqual( step++, 1, "Step 1" ); } } ).promise().done( function() { - strictEqual( step++, 4, "Step 4" ); + assert.strictEqual( step++, 4, "Step 4" ); } ); this.clock.tick( 1000 ); } ); -test( "animate does not change start value for non-px animation (#7109)", function() { - expect( 1 ); +QUnit.test( "animate does not change start value for non-px animation (#7109)", function( assert ) { + assert.expect( 1 ); var parent = jQuery( "<div><div></div></div>" ).css( { width: 284, height: 1 } ).appendTo( "#qunit-fixture" ), child = parent.children().css( { fontSize: "98.6in", width: "0.01em", height: 1 } ), @@ -1810,22 +1810,22 @@ test( "animate does not change start value for non-px animation (#7109)", functi } } ).queue( function( next ) { var ratio = computed[ 0 ] / actual; - ok( ratio > 0.9 && ratio < 1.1, "Starting width was close enough" ); + assert.ok( ratio > 0.9 && ratio < 1.1, "Starting width was close enough" ); next(); parent.remove(); } ); this.clock.tick( 10 ); } ); -test( "non-px animation handles non-numeric start (#11971)", function() { - expect( 2 ); +QUnit.test( "non-px animation handles non-numeric start (#11971)", function( assert ) { + assert.expect( 2 ); var foo = jQuery( "#foo" ), initial = foo.css( "backgroundPositionX" ); if ( !initial ) { - expect( 1 ); - ok( true, "Style property not understood" ); + assert.expect( 1 ); + assert.ok( true, "Style property not understood" ); return; } @@ -1837,20 +1837,20 @@ test( "non-px animation handles non-numeric start (#11971)", function() { } if ( parseFloat( initial ) ) { - equal( jQuery.style( this, "backgroundPositionX" ), initial, "Numeric start preserved" ); + assert.equal( jQuery.style( this, "backgroundPositionX" ), initial, "Numeric start preserved" ); } else { - equal( jQuery.style( this, "backgroundPositionX" ), "0%", "Non-numeric start zeroed" ); + assert.equal( jQuery.style( this, "backgroundPositionX" ), "0%", "Non-numeric start zeroed" ); } }, done: function() { - equal( jQuery.style( this, "backgroundPositionX" ), "42%", "End reached" ); + assert.equal( jQuery.style( this, "backgroundPositionX" ), "42%", "End reached" ); } } ); this.clock.tick( 10 ); } ); -test( "Animation callbacks (#11797)", function() { - expect( 15 ); +QUnit.test( "Animation callbacks (#11797)", function( assert ) { + assert.expect( 15 ); var targets = jQuery( "#foo" ).children(), done = false, @@ -1859,24 +1859,24 @@ test( "Animation callbacks (#11797)", function() { targets.eq( 0 ).animate( {}, { duration: 1, start: function() { - ok( true, "empty: start" ); + assert.ok( true, "empty: start" ); }, progress: function( anim, percent ) { - equal( percent, 0, "empty: progress 0" ); + assert.equal( percent, 0, "empty: progress 0" ); }, done: function() { - ok( true, "empty: done" ); + assert.ok( true, "empty: done" ); }, fail: function() { - ok( false, "empty: fail" ); + assert.ok( false, "empty: fail" ); }, always: function() { - ok( true, "empty: always" ); + assert.ok( true, "empty: always" ); done = true; } } ); - ok( done, "empty: done immediately" ); + assert.ok( done, "empty: done immediately" ); done = false; targets.eq( 1 ).animate( { @@ -1884,31 +1884,31 @@ test( "Animation callbacks (#11797)", function() { }, { duration: 1, start: function() { - ok( true, "stopped: start" ); + assert.ok( true, "stopped: start" ); }, progress: function( anim, percent ) { - equal( percent, 0, "stopped: progress 0" ); + assert.equal( percent, 0, "stopped: progress 0" ); }, done: function() { - ok( false, "stopped: done" ); + assert.ok( false, "stopped: done" ); }, fail: function() { - ok( true, "stopped: fail" ); + assert.ok( true, "stopped: fail" ); }, always: function() { - ok( true, "stopped: always" ); + assert.ok( true, "stopped: always" ); done = true; } } ).stop(); - ok( done, "stopped: stopped immediately" ); + assert.ok( done, "stopped: stopped immediately" ); targets.eq( 2 ).animate( { opacity: 0 }, { duration: 1, start: function() { - ok( true, "async: start" ); + assert.ok( true, "async: start" ); }, progress: function( anim, percent ) { @@ -1916,26 +1916,26 @@ test( "Animation callbacks (#11797)", function() { if ( percent === 0 && expectedProgress === 1 ) { return; } - equal( percent, expectedProgress, "async: progress " + expectedProgress ); + assert.equal( percent, expectedProgress, "async: progress " + expectedProgress ); // once at 0, once at 1 expectedProgress++; }, done: function() { - ok( true, "async: done" ); + assert.ok( true, "async: done" ); }, fail: function() { - ok( false, "async: fail" ); + assert.ok( false, "async: fail" ); }, always: function() { - ok( true, "async: always" ); + assert.ok( true, "async: always" ); } } ); this.clock.tick( 10 ); } ); -test( "Animate properly sets overflow hidden when animating width/height (#12117)", function() { - expect( 8 ); +QUnit.test( "Animate properly sets overflow hidden when animating width/height (#12117)", function( assert ) { + assert.expect( 8 ); jQuery.each( [ "height", "width" ], function( _, prop ) { jQuery.each( [ 100, 0 ], function( _, value ) { @@ -1943,26 +1943,26 @@ test( "Animate properly sets overflow hidden when animating width/height (#12117 props = {}; props[ prop ] = value; div.animate( props, 1 ); - equal( div.css( "overflow" ), "hidden", + assert.equal( div.css( "overflow" ), "hidden", "overflow: hidden set when animating " + prop + " to " + value ); div.stop(); - equal( div.css( "overflow" ), "auto", + assert.equal( div.css( "overflow" ), "auto", "overflow: auto restored after animating " + prop + " to " + value ); } ); } ); } ); -test( "Each tick of the timer loop uses a fresh time (#12837)", function() { +QUnit.test( "Each tick of the timer loop uses a fresh time (#12837)", function( assert ) { var lastVal, tmp = jQuery( { test: 0 } ); - expect( 3 ); + assert.expect( 3 ); tmp.animate( { test: 100 }, { step: function( p, fx ) { - ok( fx.now !== lastVal, "Current value is not the last value: " + lastVal + " - " + fx.now ); + assert.ok( fx.now !== lastVal, "Current value is not the last value: " + lastVal + " - " + fx.now ); lastVal = fx.now; } } ); @@ -1977,11 +1977,11 @@ test( "Each tick of the timer loop uses a fresh time (#12837)", function() { tmp.stop(); } ); -test( "Animations with 0 duration don't ease (#12273)", function() { - expect( 1 ); +QUnit.test( "Animations with 0 duration don't ease (#12273)", function( assert ) { + assert.expect( 1 ); jQuery.easing.test = function() { - ok( false, "Called easing" ); + assert.ok( false, "Called easing" ); }; jQuery( "#foo" ).animate( { @@ -1990,7 +1990,7 @@ test( "Animations with 0 duration don't ease (#12273)", function() { duration: 0, easing: "test", complete: function() { - equal( jQuery( this ).height(), 100, "Height is 100" ); + assert.equal( jQuery( this ).height(), 100, "Height is 100" ); } } ); @@ -2002,7 +2002,7 @@ jQuery.map( [ "toggle", "slideToggle", "fadeToggle" ], function( method ) { // this test would look a lot better if we were using something to override // the default timers var duration = 1500; - test( "toggle state tests: " + method + " (#8685)", function() { + QUnit.test( "toggle state tests: " + method + " (#8685)", function( assert ) { function secondToggle() { var stopped = parseFloat( element.css( check ) ); tested = false; @@ -2011,8 +2011,8 @@ jQuery.map( [ "toggle", "slideToggle", "fadeToggle" ], function( method ) { step: function( p, fx ) { if ( fx.pos > 0.1 && fx.prop === check && !tested ) { tested = true; - equal( fx.start, stopped, check + " starts at " + stopped + " where it stopped" ); - equal( fx.end, original, check + " ending value is " + original ); + assert.equal( fx.start, stopped, check + " starts at " + stopped + " where it stopped" ); + assert.equal( fx.end, original, check + " ending value is " + original ); element.stop(); } } @@ -2024,7 +2024,7 @@ jQuery.map( [ "toggle", "slideToggle", "fadeToggle" ], function( method ) { check = method === "slideToggle" ? "height" : "opacity", element = jQuery( "#foo" ).height( 200 ); - expect( 4 ); + assert.expect( 4 ); element[ method ]( { duration: duration, @@ -2033,8 +2033,8 @@ jQuery.map( [ "toggle", "slideToggle", "fadeToggle" ], function( method ) { if ( fx.pos > 0.1 && fx.prop === check && !tested ) { tested = true; original = fx.start; - ok( fx.start !== 0, check + " is starting at " + original + " on first toggle (non-zero)" ); - equal( fx.end, 0, check + " is ending at 0 on first toggle" ); + assert.ok( fx.start !== 0, check + " is starting at " + original + " on first toggle (non-zero)" ); + assert.equal( fx.end, 0, check + " is ending at 0 on first toggle" ); element.stop(); } }, @@ -2046,18 +2046,18 @@ jQuery.map( [ "toggle", "slideToggle", "fadeToggle" ], function( method ) { } ); } ); -test( "jQuery.fx.start & jQuery.fx.stop hook points", function() { +QUnit.test( "jQuery.fx.start & jQuery.fx.stop hook points", function( assert ) { var oldStart = jQuery.fx.start, oldStop = jQuery.fx.stop, foo = jQuery( { foo: 0 } ); - expect( 3 ); + assert.expect( 3 ); jQuery.fx.start = function() { - ok( true, "start called" ); + assert.ok( true, "start called" ); }; jQuery.fx.stop = function() { - ok( true, "stop called" ); + assert.ok( true, "stop called" ); }; // calls start @@ -2075,7 +2075,7 @@ test( "jQuery.fx.start & jQuery.fx.stop hook points", function() { jQuery.fx.stop = oldStop; } ); -test( ".finish() completes all queued animations", function() { +QUnit.test( ".finish() completes all queued animations", function( assert ) { var animations = { top: 100, left: 100, @@ -2084,7 +2084,7 @@ test( ".finish() completes all queued animations", function() { }, div = jQuery( "<div>" ); - expect( 11 ); + assert.expect( 11 ); jQuery.each( animations, function( prop, value ) { var anim = {}; @@ -2092,16 +2092,16 @@ test( ".finish() completes all queued animations", function() { // the delay shouldn't matter at all! div.css( prop, 1 ).animate( anim, function() { - ok( true, "Called animation callback for " + prop ); + assert.ok( true, "Called animation callback for " + prop ); } ).delay( 100 ); } ); - equal( div.queue().length, 8, "8 animations in the queue" ); + assert.equal( div.queue().length, 8, "8 animations in the queue" ); div.finish(); jQuery.each( animations, function( prop, value ) { - equal( parseFloat( div.css( prop ) ), value, prop + " finished at correct value" ); + assert.equal( parseFloat( div.css( prop ) ), value, prop + " finished at correct value" ); } ); - equal( div.queue().length, 0, "empty queue when done" ); - equal( div.is( ":animated" ), false, ":animated doesn't match" ); + assert.equal( div.queue().length, 0, "empty queue when done" ); + assert.equal( div.is( ":animated" ), false, ":animated doesn't match" ); // cleanup div.remove(); @@ -2110,7 +2110,7 @@ test( ".finish() completes all queued animations", function() { jQuery.fx.tick(); } ); -test( ".finish( false ) - unqueued animations", function() { +QUnit.test( ".finish( false ) - unqueued animations", function( assert ) { var animations = { top: 100, left: 100, @@ -2119,7 +2119,7 @@ test( ".finish( false ) - unqueued animations", function() { }, div = jQuery( "<div>" ); - expect( 10 ); + assert.expect( 10 ); jQuery.each( animations, function( prop, value ) { var anim = {}; @@ -2127,16 +2127,16 @@ test( ".finish( false ) - unqueued animations", function() { div.css( prop, 1 ).animate( anim, { queue: false, complete: function() { - ok( true, "Called animation callback for " + prop ); + assert.ok( true, "Called animation callback for " + prop ); } } ); } ); - equal( div.queue().length, 0, "0 animations in the queue" ); + assert.equal( div.queue().length, 0, "0 animations in the queue" ); div.finish( false ); jQuery.each( animations, function( prop, value ) { - equal( parseFloat( div.css( prop ) ), value, prop + " finished at correct value" ); + assert.equal( parseFloat( div.css( prop ) ), value, prop + " finished at correct value" ); } ); - equal( div.is( ":animated" ), false, ":animated doesn't match" ); + assert.equal( div.is( ":animated" ), false, ":animated doesn't match" ); // cleanup div.remove(); @@ -2145,7 +2145,7 @@ test( ".finish( false ) - unqueued animations", function() { jQuery.fx.tick(); } ); -test( ".finish( \"custom\" ) - custom queue animations", function() { +QUnit.test( ".finish( \"custom\" ) - custom queue animations", function( assert ) { var animations = { top: 100, left: 100, @@ -2154,7 +2154,7 @@ test( ".finish( \"custom\" ) - custom queue animations", function() { }, div = jQuery( "<div>" ); - expect( 11 ); + assert.expect( 11 ); jQuery.each( animations, function( prop, value ) { var anim = {}; @@ -2162,20 +2162,20 @@ test( ".finish( \"custom\" ) - custom queue animations", function() { div.css( prop, 1 ).animate( anim, { queue: "custom", complete: function() { - ok( true, "Called animation callback for " + prop ); + assert.ok( true, "Called animation callback for " + prop ); } } ); } ); - equal( div.queue( "custom" ).length, 4, "4 animations in the queue" ); + assert.equal( div.queue( "custom" ).length, 4, "4 animations in the queue" ); // start the first animation div.dequeue( "custom" ); - equal( div.is( ":animated" ), true, ":animated matches" ); + assert.equal( div.is( ":animated" ), true, ":animated matches" ); div.finish( "custom" ); jQuery.each( animations, function( prop, value ) { - equal( parseFloat( div.css( prop ) ), value, prop + " finished at correct value" ); + assert.equal( parseFloat( div.css( prop ) ), value, prop + " finished at correct value" ); } ); - equal( div.is( ":animated" ), false, ":animated doesn't match" ); + assert.equal( div.is( ":animated" ), false, ":animated doesn't match" ); // cleanup div.remove(); @@ -2184,51 +2184,51 @@ test( ".finish( \"custom\" ) - custom queue animations", function() { jQuery.fx.tick(); } ); -test( ".finish() calls finish of custom queue functions", function() { +QUnit.test( ".finish() calls finish of custom queue functions", function( assert ) { function queueTester( next, hooks ) { hooks.stop = function( gotoEnd ) { inside++; - equal( this, div[ 0 ] ); - ok( gotoEnd, "hooks.stop(true) called" ); + assert.equal( this, div[ 0 ] ); + assert.ok( gotoEnd, "hooks.stop(true) called" ); }; } var div = jQuery( "<div>" ), inside = 0, outside = 0; - expect( 6 ); + assert.expect( 6 ); queueTester.finish = function() { outside++; - ok( true, "Finish called on custom queue function" ); + assert.ok( true, "Finish called on custom queue function" ); }; div.queue( queueTester ).queue( queueTester ).queue( queueTester ).finish(); - equal( inside, 1, "1 stop(true) callback" ); - equal( outside, 2, "2 finish callbacks" ); + assert.equal( inside, 1, "1 stop(true) callback" ); + assert.equal( outside, 2, "2 finish callbacks" ); div.remove(); } ); -test( ".finish() is applied correctly when multiple elements were animated (#13937)", function() { - expect( 3 ); +QUnit.test( ".finish() is applied correctly when multiple elements were animated (#13937)", function( assert ) { + assert.expect( 3 ); var elems = jQuery( "<a>0</a><a>1</a><a>2</a>" ); elems.animate( { opacity: 0 }, 1500 ).animate( { opacity: 1 }, 1500 ); setTimeout( function() { elems.eq( 1 ).finish(); - ok( !elems.eq( 1 ).queue().length, "empty queue for .finish()ed element" ); - ok( elems.eq( 0 ).queue().length, "non-empty queue for preceding element" ); - ok( elems.eq( 2 ).queue().length, "non-empty queue for following element" ); + assert.ok( !elems.eq( 1 ).queue().length, "empty queue for .finish()ed element" ); + assert.ok( elems.eq( 0 ).queue().length, "non-empty queue for preceding element" ); + assert.ok( elems.eq( 2 ).queue().length, "non-empty queue for following element" ); elems.stop( true ); }, 100 ); this.clock.tick( 1500 ); } ); -test( "slideDown() after stop() (#13483)", function() { - expect( 2 ); +QUnit.test( "slideDown() after stop() (#13483)", function( assert ) { + assert.expect( 2 ); var ul = jQuery( "<ul style='height: 100px; display: block;'></ul>" ) .appendTo( "#qunit-fixture" ), @@ -2240,7 +2240,7 @@ test( "slideDown() after stop() (#13483)", function() { clock.tick( 500 ); ul.stop( true ); ul.slideDown( 1, function() { - equal( ul.height(), origHeight, "slideDown() after interrupting slideUp() with stop(). Height must be in original value" ); + assert.equal( ul.height(), origHeight, "slideDown() after interrupting slideUp() with stop(). Height must be in original value" ); // Second test. slideDown() -> stop() in the middle -> slideDown() until the end ul.slideUp( 1 ); @@ -2249,7 +2249,7 @@ test( "slideDown() after stop() (#13483)", function() { clock.tick( 500 ); ul.stop( true ); ul.slideDown( 1 ); - equal( ul.height(), origHeight, "slideDown() after interrupting slideDown() with stop(). Height must be in original value" ); + assert.equal( ul.height(), origHeight, "slideDown() after interrupting slideDown() with stop(). Height must be in original value" ); // Cleanup ul.remove(); @@ -2260,8 +2260,8 @@ test( "slideDown() after stop() (#13483)", function() { clock.tick( 10 ); } ); -test( "Respect display value on inline elements (#14824)", function() { - expect( 2 ); +QUnit.test( "Respect display value on inline elements (#14824)", function( assert ) { + assert.expect( 2 ); var clock = this.clock, fromStyleSheet = jQuery( "<span id='span-14824' />" ), @@ -2271,14 +2271,14 @@ test( "Respect display value on inline elements (#14824)", function() { fromStyleSheet.slideUp( function() { jQuery( this ).slideDown( function() { - equal( jQuery( this ).css( "display" ), "block", + assert.equal( jQuery( this ).css( "display" ), "block", "Respect previous display value (from stylesheet) on span element" ); } ); } ); fromStyleAttr.slideUp( function() { jQuery( this ).slideDown( function() { - equal( jQuery( this ).css( "display" ), "block", + assert.equal( jQuery( this ).css( "display" ), "block", "Respect previous display value (from style attribute) on span element" ); } ); } ); @@ -2286,14 +2286,14 @@ test( "Respect display value on inline elements (#14824)", function() { clock.tick( 800 ); } ); -test( "jQuery.easing._default (gh-2218)", function() { - expect( 2 ); +QUnit.test( "jQuery.easing._default (gh-2218)", function( assert ) { + assert.expect( 2 ); jQuery( "#foo" ) .animate( { width: "5px" }, { duration: 5, start: function( anim ) { - equal( anim.opts.easing, jQuery.easing._default, + assert.equal( anim.opts.easing, jQuery.easing._default, "anim.opts.easing should be equal to jQuery.easing._default when the easing argument is not given" ); } } ) @@ -2301,7 +2301,7 @@ test( "jQuery.easing._default (gh-2218)", function() { duration: 5, easing: "linear", start: function( anim ) { - equal( anim.opts.easing, "linear", + assert.equal( anim.opts.easing, "linear", "anim.opts.easing should be equal to the easing argument" ); } } ) @@ -2310,8 +2310,8 @@ test( "jQuery.easing._default (gh-2218)", function() { this.clock.tick( 25 ); } ); -test( "jQuery.easing._default in Animation (gh-2218", function() { - expect( 3 ); +QUnit.test( "jQuery.easing._default in Animation (gh-2218", function( assert ) { + assert.expect( 3 ); var animation, defaultEasing = jQuery.easing._default, @@ -2327,9 +2327,9 @@ test( "jQuery.easing._default in Animation (gh-2218", function() { animation = jQuery.Animation( testObject, testDest, { "duration": 1 } ); animation.done( function() { - equal( testObject.width, testDest.width, "Animated width" ); - ok( called, "Custom jQuery.easing._default called" ); - strictEqual( animation.opts.easing, "custom", + assert.equal( testObject.width, testDest.width, "Animated width" ); + assert.ok( called, "Custom jQuery.easing._default called" ); + assert.strictEqual( animation.opts.easing, "custom", "Animation used custom jQuery.easing._default" ); jQuery.easing._default = defaultEasing; delete jQuery.easing.custom; @@ -2338,8 +2338,8 @@ test( "jQuery.easing._default in Animation (gh-2218", function() { this.clock.tick( 10 ); } ); -test( "jQuery.easing._default in Tween (gh-2218)", function() { - expect( 3 ); +QUnit.test( "jQuery.easing._default in Tween (gh-2218)", function( assert ) { + assert.expect( 3 ); var tween, defaultEasing = jQuery.easing._default, @@ -2354,35 +2354,35 @@ test( "jQuery.easing._default in Tween (gh-2218)", function() { tween = jQuery.Tween( testObject, { "duration": 1 }, "width", 200 ); tween.run( 1 ); - equal( testObject.width, 200, "Animated width" ); - ok( called, "Custom jQuery.easing._default called" ); - strictEqual( tween.easing, "custom", + assert.equal( testObject.width, 200, "Animated width" ); + assert.ok( called, "Custom jQuery.easing._default called" ); + assert.strictEqual( tween.easing, "custom", "Animation used custom jQuery.easing._default" ); jQuery.easing._default = defaultEasing; delete jQuery.easing.custom; } ); -test( "Display value is correct for disconnected nodes (trac-13310)", function() { - expect( 3 ); +QUnit.test( "Display value is correct for disconnected nodes (trac-13310)", function( assert ) { + assert.expect( 3 ); var div = jQuery( "<div/>" ); - equal( div.css( "display", "inline" ).hide().show().appendTo( "body" ).css( "display" ), "inline", "Initialized display value has returned" ); + assert.equal( div.css( "display", "inline" ).hide().show().appendTo( "body" ).css( "display" ), "inline", "Initialized display value has returned" ); div.remove(); div.css( "display", "none" ).hide(); - equal( jQuery._data( div[ 0 ], "display" ), undefined, "display data is undefined after hiding a detached and hidden element" ); + assert.equal( jQuery._data( div[ 0 ], "display" ), undefined, "display data is undefined after hiding a detached and hidden element" ); div.remove(); div.css( "display", "inline-block" ).hide().appendTo( "body" ).fadeIn( function() { - equal( div.css( "display" ), "inline-block", "Initialized display value has returned" ); + assert.equal( div.css( "display" ), "inline-block", "Initialized display value has returned" ); div.remove(); } ); this.clock.tick( 1000 ); } ); -test( "Show/hide/toggle and display: inline", function() { - expect( 40 ); +QUnit.test( "Show/hide/toggle and display: inline", function( assert ) { + assert.expect( 40 ); var clock = this.clock; @@ -2416,7 +2416,7 @@ test( "Show/hide/toggle and display: inline", function() { jQuery( completed ).each( function() { var $el = jQuery( this ), call = $el.data( "call" ); - strictEqual( $el.css( "display" ), "inline-block", kind + " display during " + call ); + assert.strictEqual( $el.css( "display" ), "inline-block", kind + " display during " + call ); } ); // Interrupted elements should remain inline-block @@ -2425,7 +2425,7 @@ test( "Show/hide/toggle and display: inline", function() { jQuery( interrupted ).each( function() { var $el = jQuery( this ), call = $el.data( "call" ); - strictEqual( $el.css( "display" ), "inline-block", kind + " display after " + call ); + assert.strictEqual( $el.css( "display" ), "inline-block", kind + " display after " + call ); } ); // Completed elements should not remain inline-block @@ -2434,7 +2434,7 @@ test( "Show/hide/toggle and display: inline", function() { var $el = jQuery( this ), call = $el.data( "call" ), display = $el.data( "done" ); - strictEqual( $el.css( "display" ), display, kind + " display after " + call ); + assert.strictEqual( $el.css( "display" ), display, kind + " display after " + call ); } ); // A post-animation toggle should not make any element inline-block @@ -2444,7 +2444,7 @@ test( "Show/hide/toggle and display: inline", function() { completed.each( function() { var $el = jQuery( this ), call = $el.data( "call" ); - ok( $el.css( "display" ) !== "inline-block", + assert.ok( $el.css( "display" ) !== "inline-block", kind + " display is not inline-block after " + call + "+toggle" ); } ); } ); |