Commit 4b91b918 authored by Anton M's avatar Anton M

Fix a some inaccuracies in the original test case for #7912.

- Use fresh div instead of one outside the test-fixture
- make sure the empty string test tests actually that (not 0% 0%)
- actually test for < -10000 (#7193)
- fixed some whitespace issues
parent 85d93432
...@@ -558,42 +558,52 @@ jQuery.checkOverflowDisplay = function(){ ...@@ -558,42 +558,52 @@ jQuery.checkOverflowDisplay = function(){
start(); start();
} }
test("jQuery.fx.prototype.cur()", function() { test( "jQuery.fx.prototype.cur()", 6, function() {
expect(5); var div = jQuery( "<div></div>" ).appendTo( "#main" ).css({
var nothiddendiv = jQuery('#nothiddendiv').css({ color: "#ABC",
color: '#ABC', border: "5px solid black",
border: '5px solid black', left: "auto",
left: 'auto', marginBottom: "-11000px"
marginBottom: '11000px'
})[0]; })[0];
equals( equals(
(new jQuery.fx( nothiddendiv, {}, 'color' )).cur(), ( new jQuery.fx( div, {}, "color" ) ).cur(),
jQuery.css( nothiddendiv,'color' ), jQuery.css( div, "color" ),
"Return the same value as jQuery.css for complex properties (bug #7912)" "Return the same value as jQuery.css for complex properties (bug #7912)"
); );
strictEqual( strictEqual(
(new jQuery.fx( nothiddendiv, {}, 'borderLeftWidth' )).cur(), ( new jQuery.fx( div, {}, "borderLeftWidth" ) ).cur(),
5, 5,
"Return simple values parsed as Float" "Return simple values parsed as Float"
); );
// backgroundPosition actually returns 0% 0% in most browser
// this fakes a "" return
jQuery.cssHooks.backgroundPosition = {
get: function() {
ok( true, "hook used" );
return "";
}
};
strictEqual( strictEqual(
(new jQuery.fx( nothiddendiv, {}, 'backgroundPosition' )).cur(), ( new jQuery.fx( div, {}, "backgroundPosition" ) ).cur(),
0, 0,
'Return 0 when jQuery.css returns an empty string' "Return 0 when jQuery.css returns an empty string"
); );
delete jQuery.cssHooks.backgroundPosition;
strictEqual( strictEqual(
(new jQuery.fx( nothiddendiv, {}, 'left' )).cur(), ( new jQuery.fx( div, {}, "left" ) ).cur(),
0, 0,
'Return 0 when jQuery.css returns "auto"' "Return 0 when jQuery.css returns 'auto'"
); );
equals( equals(
(new jQuery.fx( nothiddendiv, {}, 'marginBottom' )).cur(), ( new jQuery.fx( div, {}, "marginBottom" ) ).cur(),
11000, -11000,
"support negative values < -10000 (bug #7193)" "support negative values < -10000 (bug #7193)"
); );
}); });
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment