library-mirrors/jquery
1
0
Fork 0
mirror of https://github.com/jquery/jquery.git synced 2024-11-23 02:54:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Effects: add tests for jQuery.easing._default in Animation and Tween

Browse Source 
Ref gh-2219
This commit is contained in:
Timmy Willison 2015-05-05 11:22:40 -07:00
parent b7f9e62642
commit b9b5c23fd7
1 changed files with 80 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
test/unit/effects.js vendored
View File

@ -1144,6 +1144,7 @@ test( "interrupt toggle", function() {
}, shortDuration ); }, shortDuration );
}); });
clock.tick( longDuration ); clock.tick( longDuration );
// FIXME untangle the set timeouts // FIXME untangle the set timeouts
}); });
@ -1152,40 +1153,39 @@ test("animate with per-property easing", function(){
expect( 5 ); expect( 5 );
var data = { a: 0, b: 0, c: 0 }, var data = { a: 0, b: 0, c: 0 },
_test1_called = false, test1Called = false,
_test2_called = false, test2Called = false,
_default_test_called = false, defaultTestCalled = false,
props = { props = {
a: [ 100, "_test1" ], a: [ 100, "_test1" ],
b: [ 100, "_test2" ], b: [ 100, "_test2" ],
c: 100 c: 100
}; };
jQuery.easing["_test1"] = function(p) { jQuery.easing._test1 = function( p ) {
_test1_called = true; test1Called = true;
return p; return p;
}; };
jQuery.easing["_test2"] = function(p) { jQuery.easing._test2 = function( p ) {
_test2_called = true; test2Called = true;
return p; return p;
}; };
jQuery.easing["_default_test"] = function(p) { jQuery.easing._defaultTest = function( p ) {
_default_test_called = true; defaultTestCalled = true;
return p; return p;
}; };
jQuery(data).animate( props, 400, "_default_test", function(){ jQuery( data ).animate( props, 400, "_defaultTest", function() {
ok( test1Called, "Easing function (_test1) called" );
ok( _test1_called, "Easing function (_test1) called" ); ok( test2Called, "Easing function (_test2) called" );
ok( _test2_called, "Easing function (_test2) called" ); ok( defaultTestCalled, "Easing function (_default) called" );
ok( _default_test_called, "Easing function (_default) called" );
equal( props.a[ 1 ], "_test1", "animate does not change original props (per-property easing would be lost)" ); 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)" ); equal( props.b[ 1 ], "_test2", "animate does not change original props (per-property easing would be lost)" );
}); });
this.clock.tick( 400 );
this.clock.tick( 400 );
}); });
test("animate with CSS shorthand properties", function(){ test("animate with CSS shorthand properties", function(){
@ -2227,7 +2227,9 @@ test( "Animation should go to its end state if document.hidden = true", 1, funct
} }
}); });
test( "jQuery.easing._default (#2218)", 2, function() { test( "jQuery.easing._default (gh-2218)", function() {
expect( 2 );
jQuery( "#foo" ) jQuery( "#foo" )
.animate( { width: "5px" }, { .animate( { width: "5px" }, {
duration: 5, duration: 5,
@ -2245,7 +2247,60 @@ test( "jQuery.easing._default (#2218)", 2, function() {
} }
}) })
.stop(); .stop();
this.clock.tick( 25 ); this.clock.tick( 25 );
}); });
test( "jQuery.easing._default in Animation (gh-2218", function() {
expect( 3 );
var animation,
defaultEasing = jQuery.easing._default,
called = false,
testObject = { "width": 100 },
testDest = { "width": 200 };
jQuery.easing.custom = function( p ) {
called = true;
return p;
};
jQuery.easing._default = "custom";
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",
"Animation used custom jQuery.easing._default" );
jQuery.easing._default = defaultEasing;
delete jQuery.easing.custom;
});
this.clock.tick( 10 );
});
test( "jQuery.easing._default in Tween (gh-2218)", function() {
expect( 3 );
var tween,
defaultEasing = jQuery.easing._default,
called = false,
testObject = { "width": 100 };
jQuery.easing.custom = function( p ) {
called = true;
return p;
};
jQuery.easing._default = "custom";
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",
"Animation used custom jQuery.easing._default" );
jQuery.easing._default = defaultEasing;
delete jQuery.easing.custom;
});
})(); })();