Merge branch 'master' into selectmenu

5 files changed, 20 insertions, 17 deletions

diff --git a/tests/unit/datepicker/datepicker_options.js b/tests/unit/datepicker/datepicker_options.js
index a775a5302..25257e99f 100644
--- a/tests/unit/datepicker/datepicker_options.js
+++ b/tests/unit/datepicker/datepicker_options.js
@@ -1057,13 +1057,13 @@ test("formatDate", function() {
 	settings = {dayNamesShort: fr.dayNamesShort, dayNames: fr.dayNames,
 		monthNamesShort: fr.monthNamesShort, monthNames: fr.monthNames};
 	equal($.datepicker.formatDate("D M y", new Date(2001, 4 - 1, 9), settings),
-		"Lun. Avril 01", "Format date D M y with settings");
+		"lun. avril 01", "Format date D M y with settings");
 	equal($.datepicker.formatDate("DD MM yy", new Date(2001, 4 - 1, 9), settings),
-		"Lundi Avril 2001", "Format date DD MM yy with settings");
+		"lundi avril 2001", "Format date DD MM yy with settings");
 	equal($.datepicker.formatDate("DD, MM d, yy", new Date(2001, 4 - 1, 9), settings),
-		"Lundi, Avril 9, 2001", "Format date DD, MM d, yy with settings");
+		"lundi, avril 9, 2001", "Format date DD, MM d, yy with settings");
 	equal($.datepicker.formatDate("'jour' d 'de' MM (''DD''), yy",
-		new Date(2001, 4 - 1, 9), settings), "jour 9 de Avril ('Lundi'), 2001",
+		new Date(2001, 4 - 1, 9), settings), "jour 9 de avril ('lundi'), 2001",
 		"Format date 'jour' d 'de' MM (''DD''), yy with settings");
 });
 
diff --git a/tests/unit/slider/slider_core.js b/tests/unit/slider/slider_core.js
index 19c9abb8e..3649bded0 100644
--- a/tests/unit/slider/slider_core.js
+++ b/tests/unit/slider/slider_core.js
@@ -1,6 +1,3 @@
-/*
- * slider unit tests
- */
 (function( $ ) {
 //
 // Slider Test Helper Functions
diff --git a/tests/unit/slider/slider_events.js b/tests/unit/slider/slider_events.js
index 92b0bdedd..ec93a0565 100644
--- a/tests/unit/slider/slider_events.js
+++ b/tests/unit/slider/slider_events.js
@@ -1,6 +1,3 @@
-/*
- * slider_events.js
- */
 (function( $ ) {
 
 module( "slider: events" );
diff --git a/tests/unit/slider/slider_methods.js b/tests/unit/slider/slider_methods.js
index bd9023133..c5c7e1254 100644
--- a/tests/unit/slider/slider_methods.js
+++ b/tests/unit/slider/slider_methods.js
@@ -1,6 +1,3 @@
-/*
- * slider_methods.js
- */
 (function( $ ) {
 
 module( "slider: methods" );
diff --git a/tests/unit/slider/slider_options.js b/tests/unit/slider/slider_options.js
index 3a6f55390..5cfb5351a 100644
--- a/tests/unit/slider/slider_options.js
+++ b/tests/unit/slider/slider_options.js
@@ -1,6 +1,3 @@
-/*
- * slider_options.js
- */
 (function( $ ) {
 
 var element, options;
@@ -200,7 +197,7 @@ test( "values", function() {
 });
 
 test( "range", function() {
-	expect( 27 );
+	expect( 33 );
 	var range;
 
 	// min
@@ -300,6 +297,21 @@ test( "range", function() {
 	equal( element.slider( "option", "values" ), null, "values" );
 	deepEqual( element.slider( "values" ), [] , "values" );
 	element.slider( "destroy" );
+
+	// Change range from true to false
+	element = $( "<div></div>" ).slider({
+		range: true,
+		min: 1,
+		max: 10,
+		step: 1
+	}).slider( "option", "range", false );
+	equal( element.find( ".ui-slider-handle" ).length, 2, "range switch from true to false, both handles remain" );
+	equal( element.find( ".ui-slider-range" ).length, 0, "range switch from true to false" );
+	equal( element.slider( "option", "value" ), 0 , "option value" );
+	equal( element.slider( "value" ), 1 , "value" );
+	deepEqual( element.slider( "option", "values" ), [1, 1], "option values" );
+	deepEqual( element.slider( "values" ), [1, 1], "values" );
+	element.slider( "destroy" );
 });
 
 })( jQuery );