Merge branch 'master' into datepickerdatepicker

# Conflicts:
#	ui/i18n/datepicker-pt.js

1 files changed, 18 insertions, 0 deletions

diff --git a/tests/unit/button/deprecated.js b/tests/unit/button/deprecated.js
index 81a0281b7..86fca797e 100644
--- a/tests/unit/button/deprecated.js
+++ b/tests/unit/button/deprecated.js
@@ -194,4 +194,22 @@ QUnit.test( "icon / icons options properly proxied", function( assert ) {
 		"Icons secondary option sets iconPosition option to end on init" );
 } );
 
+QUnit.test( "Calling button on a collection of mixed types works correctly", function( assert ) {
+	assert.expect( 5 );
+
+	var group = $( ".mixed" ).children();
+
+	group.button();
+
+	$.each( {
+		anchor: "button",
+		button: "button",
+		check: "checkboxradio",
+		input: "button",
+		radio: "checkboxradio"
+	}, function( type, widget ) {
+		assert.ok( $( "#mixed-" + type )[ widget ]( "instance" ), type + " is a " + widget );
+	} );
+} );
+
 } );