aboutsummaryrefslogtreecommitdiff
path: root/js/tests/unit
diff options
context:
space:
mode:
authorChris Rebert <[email protected]>2014-08-15 11:30:35 -0700
committerChris Rebert <[email protected]>2014-08-15 11:30:35 -0700
commit8194668c52f9fd5f3974409f1871c3882f39f4c2 (patch)
tree3104f87ee996361f0be5d466017237262cd39e31 /js/tests/unit
parenta9b7ba419a3f0b0ef0fc71a553d323c2d07af604 (diff)
parent75bffd84aeac85c98e6e537d05293e9c8823127d (diff)
downloadbootstrap-8194668c52f9fd5f3974409f1871c3882f39f4c2.tar.xz
bootstrap-8194668c52f9fd5f3974409f1871c3882f39f4c2.zip
Merge pull request #14316 from hnrch02/use-closest-alert
Use closest `.alert` for alert dismissal; closes #14306
Diffstat (limited to 'js/tests/unit')
-rw-r--r--js/tests/unit/alert.js8
1 files changed, 4 insertions, 4 deletions
diff --git a/js/tests/unit/alert.js b/js/tests/unit/alert.js
index 52505c828..bc4eed676 100644
--- a/js/tests/unit/alert.js
+++ b/js/tests/unit/alert.js
@@ -30,7 +30,7 @@ $(function () {
})
test('should fade element out on clicking .close', function () {
- var alertHTML = '<div class="alert-message warning fade in">'
+ var alertHTML = '<div class="alert alert-danger fade in">'
+ '<a class="close" href="#" data-dismiss="alert">×</a>'
+ '<p><strong>Holy guacamole!</strong> Best check yo self, you\'re not looking too good.</p>'
+ '</div>'
@@ -42,17 +42,17 @@ $(function () {
})
test('should remove element when clicking .close', function () {
- var alertHTML = '<div class="alert-message warning fade in">'
+ var alertHTML = '<div class="alert alert-danger fade in">'
+ '<a class="close" href="#" data-dismiss="alert">×</a>'
+ '<p><strong>Holy guacamole!</strong> Best check yo self, you\'re not looking too good.</p>'
+ '</div>'
var $alert = $(alertHTML).appendTo('#qunit-fixture').bootstrapAlert()
- notEqual($('#qunit-fixture').find('.alert-message').length, 0, 'element added to dom')
+ notEqual($('#qunit-fixture').find('.alert').length, 0, 'element added to dom')
$alert.find('.close').click()
- equal($('#qunit-fixture').find('.alert-message').length, 0, 'element removed from dom')
+ equal($('#qunit-fixture').find('.alert').length, 0, 'element removed from dom')
})
test('should not fire closed when close is prevented', function () {