Controlgroup: Test proper handling of non-empty class key value

Author: Gabriel Schulhof

tests/unit/controlgroup/controlgroup.html

@@ -68,6 +68,16 @@
 	<div class="controlgroup-single-button">
 		<button class="single-button">button</button>
 	</div>
+	<div class="controlgroup-non-empty-class-key">
+		<select id="non-empty-class-key-first">
+			<option>Option 1</option>
+			<option>Option 2</option>
+		</select>
+		<select id="non-empty-class-key-second">
+			<option>Option 1</option>
+			<option>Option 2</option>
+		</select>
+	</div>
 </div>
 </body>
 </html>

tests/unit/controlgroup/core.js

@@ -160,4 +160,39 @@ QUnit.test( "Single controlgroup button - vertical", function( assert ) {
 		" ui-corner-tr ui-corner-tl ui-corner-bl ui corner-br" );
 } );
 
+QUnit.module( "Controlgroup: Non-empty class key", {
+	setup: function() {
+		this.classKey = $.ui.selectmenu.prototype.options.classes[ "ui-selectmenu-button-closed" ];
+		$.ui.selectmenu.prototype.options.classes[ "ui-selectmenu-button-closed" ] =
+			$.trim( $.ui.selectmenu.prototype.options.classes[ "ui-selectmenu-button-closed" ] +
+				" something-custom" );
+	},
+	teardown: function() {
+		$.ui.selectmenu.prototype.options.classes[ "ui-selectmenu-button-closed" ] = this.classKey;
+	}
+} );
+
+QUnit.test( "Controlgroup handles non-empty class key correctly", function( assert ) {
+	assert.expect( 2 );
+
+	$( ".controlgroup-non-empty-class-key" )
+		.controlgroup()
+		.controlgroup( "instance" );
+
+	assert.deepEqual(
+		( ( ( $( "#non-empty-class-key-first" )
+			.selectmenu( "option", "classes" )[ "ui-selectmenu-button-closed" ] || "" )
+				.match( /\S+/g ) ) || [] ).sort(),
+		[ "something-custom", "ui-corner-left" ],
+		"First controlgroup item has the expected value for the class key" );
+
+	assert.deepEqual(
+		( ( ( $( "#non-empty-class-key-second" )
+			.selectmenu( "option", "classes" )[ "ui-selectmenu-button-closed" ] || "" )
+				.match( /\S+/g ) ) || [] ).sort(),
+		[ "something-custom", "ui-corner-right" ],
+		"Second controlgroup item has the expected value for the class key" );
+
+} );
+
 } );