Merge branch 'master' of github.com:jquery/jquery-ui into selectmenu

5 files changed, 30 insertions, 3 deletions

diff --git a/tests/unit/effects/effects_core.js b/tests/unit/effects/effects_core.js
index 2b4d684eb..1e5da2113 100644
--- a/tests/unit/effects/effects_core.js
+++ b/tests/unit/effects/effects_core.js
@@ -143,10 +143,10 @@ asyncTest( "animateClass clears style properties when stopped", function() {
 	expect( 2 );
 
 	test.addClass( "testChangeBackground", duration );
-	notEqual( orig, style.cssText, "cssText is the not the same after starting animation" );
+	notEqual( orig, style.cssText, "cssText is not the same after starting animation" );
 
 	test.stop( true, true );
-	equal( orig, style.cssText, "cssText is the same after stopping animation midway" );
+	equal( orig, $.trim( style.cssText ), "cssText is the same after stopping animation midway" );
 	start();
 });
 
diff --git a/tests/unit/spinner/spinner.html b/tests/unit/spinner/spinner.html
index ddfb03d91..321c16b4c 100644
--- a/tests/unit/spinner/spinner.html
+++ b/tests/unit/spinner/spinner.html
@@ -9,6 +9,7 @@
 	<script src="../../jquery.js"></script>
 	<script src="../../../external/jquery.mousewheel-3.0.4.js"></script>
 	<script src="../../../external/globalize.js"></script>
+	<script src="../../../external/globalize.culture.ja-JP.js"></script>
 	<script src="../../../ui/jquery.ui.core.js"></script>
 	<script src="../../../ui/jquery.ui.widget.js"></script>
 	<script src="../../../ui/jquery.ui.button.js"></script>
diff --git a/tests/unit/spinner/spinner_defaults.js b/tests/unit/spinner/spinner_defaults.js
index 3321f8733..0a4e7c236 100644
--- a/tests/unit/spinner/spinner_defaults.js
+++ b/tests/unit/spinner/spinner_defaults.js
@@ -1,5 +1,6 @@
 commonWidgetTests( "spinner", {
 	defaults: {
+		culture: null,
 		disabled: false,
 		incremental: true,
 		max: null,
diff --git a/tests/unit/spinner/spinner_options.js b/tests/unit/spinner/spinner_options.js
index 2b557cb69..8be57c785 100644
--- a/tests/unit/spinner/spinner_options.js
+++ b/tests/unit/spinner/spinner_options.js
@@ -2,6 +2,8 @@
 
 module( "spinner: options" );
 
+// culture is tested after numberFormat, since it depends on numberFormat
+
 test( "incremental, false", function() {
 	expect( 100 );
 
@@ -91,6 +93,29 @@ test( "numberFormat, currency", function() {
 	equal( element.val(), "$1.00", "formatted after step" );
 });
 
+test( "culture, null", function() {
+	expect( 2 );
+	Globalize.culture( "ja-JP" );
+	var element = $( "#spin" ).val( 0 ).spinner({ numberFormat: "C" });
+	equal( element.val(), "¥0", "formatted on init" );
+	element.spinner( "stepUp" );
+	equal( element.val(), "¥1", "formatted after step" );
+
+	// reset culture
+	Globalize.culture( "default" );
+});
+
+test( "currency, ja-JP", function() {
+	expect( 2 );
+	var element = $( "#spin" ).val( 0 ).spinner({
+		numberFormat: "C",
+		culture: "ja-JP"
+	});
+	equal( element.val(), "¥0", "formatted on init" );
+	element.spinner( "stepUp" );
+	equal( element.val(), "¥1", "formatted after step" );
+});
+
 test( "max", function() {
 	expect( 3 );
 	var element = $( "#spin" ).val( 1000 ).spinner({ max: 100 });
diff --git a/tests/unit/tooltip/tooltip_defaults.js b/tests/unit/tooltip/tooltip_defaults.js
index 4b687bdcb..b8b41bf47 100644
--- a/tests/unit/tooltip/tooltip_defaults.js
+++ b/tests/unit/tooltip/tooltip_defaults.js
@@ -7,7 +7,7 @@ commonWidgetTests( "tooltip", {
 		position: {
 			my: "left+15 center",
 			at: "right center",
-			collision: "flip fit"
+			collision: "flipfit flipfit"
 		},
 		show: true,
 		tooltipClass: null,