3 files changed, 22 insertions, 20 deletions

diff --git a/tests/unit/spinner/spinner_core.js b/tests/unit/spinner/spinner_core.js
index 34a79bb16..e12d1af2f 100644
--- a/tests/unit/spinner/spinner_core.js
+++ b/tests/unit/spinner/spinner_core.js
@@ -109,14 +109,12 @@ test( "mouse click on up button, increases value not greater than max", function
 });
 
 test( "mousewheel on input", function() {
-	expect( 5 );
+	expect( 4 );
 
-	var element = $( "#spin" ).spinner({
+	var element = $( "#spin" ).val( 0 ).spinner({
 		step: 2
 	});
 
-	equal( element.val(), 0 );
-
 	element.trigger( "mousewheel" );
 	equal( element.val(), 0, "mousewheel event without delta does not change value" );
 
@@ -198,10 +196,11 @@ test( "precision", function() {
 	equal( element.val(), "0.0501", "precision from step" );
 
 	element.val( 1.05 ).spinner( "option", {
-		step: 1
+		step: 1,
+		min: -9.95
 	});
 	element.spinner( "stepDown" );
-	equal( element.val(), "0.05", "precision from value" );
+	equal( element.val(), "0.05", "precision from min" );
 });
 
 })( jQuery );
diff --git a/tests/unit/spinner/spinner_methods.js b/tests/unit/spinner/spinner_methods.js
index fbfcf1bb3..a9fd6c889 100644
--- a/tests/unit/spinner/spinner_methods.js
+++ b/tests/unit/spinner/spinner_methods.js
@@ -54,7 +54,7 @@ test( "disable", function() {
 
 test( "enable", function() {
 	expect( 5 );
-	var element = $( "#spin" ).spinner({ disabled: true })
+	var element = $( "#spin" ).val( 1 ).spinner({ disabled: true })
 		wrapper = element.spinner( "widget" );
 
 	ok( wrapper.hasClass( "ui-spinner-disabled" ), "before: wrapper has ui-spinner-disabled class" );
@@ -66,7 +66,7 @@ test( "enable", function() {
 	ok( !element.is( ":disabled" ), "after: input does not have disabled attribute" );
 
 	spinner_simulateKeyDownUp( element, $.ui.keyCode.UP );
-	equals( 1, element.val(), "keyboard - value does not change on key UP" );
+	equals( 2, element.val(), "keyboard - value changes on key UP" );
 });
 
 test( "pageDown", function() {
@@ -117,23 +117,23 @@ test( "stepDown", function() {
 	});
 
 	element.spinner( "stepDown" );
-	equals( element.val(), -2, "stepDown 1 step" );
+	equals( element.val(), "-1", "stepDown 1 step" );
 
 	element.spinner( "stepDown", 5 );
-	equals( element.val(), -12, "stepDown 5 steps" );
+	equals( element.val(), "-11", "stepDown 5 steps" );
 
 	element.spinner( "stepDown", 4 );
-	equals( element.val(), -15, "close to min and stepDown 4 steps" );
+	equals( element.val(), "-15", "close to min and stepDown 4 steps" );
 
 	element.spinner( "stepDown" );
-	equals( element.val(), -15, "at min and stepDown 1 step" );
+	equals( element.val(), "-15", "at min and stepDown 1 step" );
 });
 
 test( "stepUp", function() {
 	expect( 4 );
 	var element = $( "#spin" ).val( 0 ).spinner({
 		step: 2,
-		max: 15
+		max: 16
 	});
 
 	element.spinner( "stepUp" );
@@ -143,20 +143,22 @@ test( "stepUp", function() {
 	equals( element.val(), 12, "stepUp 5 steps" );
 
 	element.spinner( "stepUp", 4 );
-	equals( element.val(), 15, "close to min and stepUp 4 steps" );
+	equals( element.val(), 16, "close to min and stepUp 4 steps" );
 
 	element.spinner( "stepUp" );
-	equals( element.val(), 15, "at max and stepUp 1 step" );
+	equals( element.val(), 16, "at max and stepUp 1 step" );
 });
 
 test( "value", function() {
 	expect( 2 );
-	var element = $( "#spin" ).val( 0 ).spinner();
+	var element = $( "#spin" ).val( 0 ).spinner({
+		step: 3
+	});
 
 	element.spinner( "value", 10 );
-	equals( element.val(), 10, "change value via value method" );
+	equals( element.val(), 9, "change value via value method" );
 
-	equals( element.spinner( "value" ), 10, "get value via value method" );
+	equals( element.spinner( "value" ), 9, "get value via value method" );
 });
 
 })( jQuery );
diff --git a/tests/unit/spinner/spinner_options.js b/tests/unit/spinner/spinner_options.js
index 48bdf96a9..2b557cb69 100644
--- a/tests/unit/spinner/spinner_options.js
+++ b/tests/unit/spinner/spinner_options.js
@@ -123,10 +123,11 @@ test( "step, 2", function() {
 	equals( element.val(), "2", "stepUp" );
 
 	element.spinner( "value", "10.5" );
-	equals( element.val(), "10.5", "value reset to 10.5" );
+	equals( element.val(), "10", "value reset to 10" );
 
+	element.val( "4.5" );
 	element.spinner( "stepUp" );
-	equals( element.val(), "12.5", "stepUp" );
+	equals( element.val(), "6", "stepUp" );
 });
 
 test( "step, 0.7", function() {