Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

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
  • Loading branch information...
commit 4b91b918a360d056a6e4a63ee306e97f839dac59 1 parent 85d9343
@jitter jitter authored
Showing with 26 additions and 16 deletions.
  1. +26 −16 test/unit/effects.js
View
42 test/unit/effects.js
@@ -558,42 +558,52 @@ jQuery.checkOverflowDisplay = function(){
start();
}
-test("jQuery.fx.prototype.cur()", function() {
- expect(5);
- var nothiddendiv = jQuery('#nothiddendiv').css({
- color: '#ABC',
- border: '5px solid black',
- left: 'auto',
- marginBottom: '11000px'
+test( "jQuery.fx.prototype.cur()", 6, function() {
+ var div = jQuery( "<div></div>" ).appendTo( "#main" ).css({
+ color: "#ABC",
+ border: "5px solid black",
+ left: "auto",
+ marginBottom: "-11000px"
})[0];
equals(
- (new jQuery.fx( nothiddendiv, {}, 'color' )).cur(),
- jQuery.css( nothiddendiv,'color' ),
+ ( new jQuery.fx( div, {}, "color" ) ).cur(),
+ jQuery.css( div, "color" ),
"Return the same value as jQuery.css for complex properties (bug #7912)"
);
strictEqual(
- (new jQuery.fx( nothiddendiv, {}, 'borderLeftWidth' )).cur(),
+ ( new jQuery.fx( div, {}, "borderLeftWidth" ) ).cur(),
5,
"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(
- (new jQuery.fx( nothiddendiv, {}, 'backgroundPosition' )).cur(),
+ ( new jQuery.fx( div, {}, "backgroundPosition" ) ).cur(),
0,
- 'Return 0 when jQuery.css returns an empty string'
+ "Return 0 when jQuery.css returns an empty string"
);
+ delete jQuery.cssHooks.backgroundPosition;
+
strictEqual(
- (new jQuery.fx( nothiddendiv, {}, 'left' )).cur(),
+ ( new jQuery.fx( div, {}, "left" ) ).cur(),
0,
- 'Return 0 when jQuery.css returns "auto"'
+ "Return 0 when jQuery.css returns 'auto'"
);
equals(
- (new jQuery.fx( nothiddendiv, {}, 'marginBottom' )).cur(),
- 11000,
+ ( new jQuery.fx( div, {}, "marginBottom" ) ).cur(),
+ -11000,
"support negative values < -10000 (bug #7193)"
);
});
Please sign in to comment.
Something went wrong with that request. Please try again.