From f1b643ec67c7c8d96e1612c4b7d73fc49b6ae3cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=CC=88rn=20Zaefferer?= <joern.zaefferer@gmail.com>
Date: Wed, 28 Oct 2015 19:04:09 +0100
Subject: [PATCH] Button: Add tests for button with html markup

Ref gh-1632
Ref jquery/api.jqueryui.com#281
---
 tests/unit/button/button.html     | 1 +
 tests/unit/button/deprecated.html | 1 +
 tests/unit/button/options.js      | 9 +++++++++
 3 files changed, 11 insertions(+)

diff --git a/tests/unit/button/button.html b/tests/unit/button/button.html
index 09b5a4c239..6cf27fb33e 100644
--- a/tests/unit/button/button.html
+++ b/tests/unit/button/button.html
@@ -14,6 +14,7 @@
 <div id="qunit-fixture">
 <form id="form1">
 	<div><button id="button">Label</button></div>
+	<div><button id="button2">label <span>with span</span></button></div>
 
 	<div><input id="submit" type="submit" value="Label"></div>
 </form>
diff --git a/tests/unit/button/deprecated.html b/tests/unit/button/deprecated.html
index 788d2eeeb6..73f62921ce 100644
--- a/tests/unit/button/deprecated.html
+++ b/tests/unit/button/deprecated.html
@@ -14,6 +14,7 @@
 <div id="qunit-fixture">
 
 <div class="buttonset"><button id="button">Label</button><button>button 2</button></div>
+<div><button id="button2">label <span>with span</span></button></div>
 
 <div id="radio0" style="margin-top: 2em;">
 	<input type="radio" id="radio01" name="radio" checked="checked"><label for="radio01">Choice 1</label>
diff --git a/tests/unit/button/options.js b/tests/unit/button/options.js
index 077d868e3b..6ef166974b 100644
--- a/tests/unit/button/options.js
+++ b/tests/unit/button/options.js
@@ -76,6 +76,15 @@ test( "label, default", function() {
 	deepEqual( button.button( "option", "label" ), "Label" );
 } );
 
+test( "label, with html markup", function() {
+	expect( 3 );
+	var button = $( "#button2" ).button();
+
+	deepEqual( button.text(), "label with span" );
+	deepEqual( button.html().toLowerCase(), "label <span>with span</span>" );
+	deepEqual( button.button( "option", "label" ).toLowerCase(), "label <span>with span</span>" );
+} );
+
 test( "label, explicit value", function() {
 	expect( 2 );
 	var button = $( "#button" ).button( {