aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Rebert <[email protected]>2014-07-08 15:40:46 -0700
committerChris Rebert <[email protected]>2014-07-08 15:40:46 -0700
commit31373309a5ac2fb295cca21ba204e2e9a73fb640 (patch)
treeb3a1b633fc1ebfe8d2cf66a3efded4a3fb837ba3
parent8c6061c1950f2bcd14baf8be549c3e532bd498cd (diff)
parent21571b3412545881f1127e83c82f8456732961c8 (diff)
downloadbootstrap-31373309a5ac2fb295cca21ba204e2e9a73fb640.tar.xz
bootstrap-31373309a5ac2fb295cca21ba204e2e9a73fb640.zip
Merge pull request #14091 from twbs/tooltip-test-html-fix
Fix unusual HTML in "should allow html entities" tooltip unit test
-rw-r--r--js/tests/unit/tooltip.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/js/tests/unit/tooltip.js b/js/tests/unit/tooltip.js
index a266b96ea..4cecf9348 100644
--- a/js/tests/unit/tooltip.js
+++ b/js/tests/unit/tooltip.js
@@ -92,7 +92,7 @@ $(function () {
})
test('should allow html entities', function () {
- var $tooltip = $('<a href="#" rel="tooltip" title="<b>@fat</b>"/>')
+ var $tooltip = $('<a href="#" rel="tooltip" title="&lt;b&gt;@fat&lt;/b&gt;"/>')
.appendTo('#qunit-fixture')
.bootstrapTooltip({ html: true })
@@ -513,7 +513,7 @@ $(function () {
})
$tooltip.bootstrapTooltip('show')
- equal($('.tooltip').children('.tooltip-inner').text(), 'Simple tooltip', 'title is set from title attribute while prefered over title option')
+ equal($('.tooltip').children('.tooltip-inner').text(), 'Simple tooltip', 'title is set from title attribute while preferred over title option')
$tooltip.bootstrapTooltip('hide')
equal($('.tooltip').length, 0, 'tooltip removed from dom')