aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorJohann-S <[email protected]>2018-05-07 15:56:24 +0200
committerXhmikosR <[email protected]>2018-05-22 17:26:21 +0300
commit0338b61eb634e7fa3369c84fd931b7c33b731562 (patch)
tree22d3846649369c3740b2d7a45c18362377ec271e /js
parent0873ab71c78639c0bf622bc3236698eb2b6d920b (diff)
downloadbootstrap-0338b61eb634e7fa3369c84fd931b7c33b731562.tar.xz
bootstrap-0338b61eb634e7fa3369c84fd931b7c33b731562.zip
chore(deps): update qunit and karma-qunit
Diffstat (limited to 'js')
-rw-r--r--js/tests/index.html4
-rw-r--r--js/tests/karma.conf.js5
-rw-r--r--js/tests/unit/alert.js1
-rw-r--r--js/tests/unit/button.js1
-rw-r--r--js/tests/unit/carousel.js1
-rw-r--r--js/tests/unit/collapse.js1
-rw-r--r--js/tests/unit/dropdown.js1
-rw-r--r--js/tests/unit/modal.js1
-rw-r--r--js/tests/unit/popover.js1
-rw-r--r--js/tests/unit/scrollspy.js1
-rw-r--r--js/tests/unit/tab.js1
-rw-r--r--js/tests/unit/tooltip.js1
-rw-r--r--js/tests/unit/util.js6
13 files changed, 22 insertions, 3 deletions
diff --git a/js/tests/index.html b/js/tests/index.html
index f48ce44eb..01af9b2d0 100644
--- a/js/tests/index.html
+++ b/js/tests/index.html
@@ -22,8 +22,8 @@
<script src="../../assets/js/vendor/popper.min.js"></script>
<!-- QUnit -->
- <link rel="stylesheet" href="../../node_modules/qunitjs/qunit/qunit.css" media="screen">
- <script src="../../node_modules/qunitjs/qunit/qunit.js"></script>
+ <link rel="stylesheet" href="../../node_modules/qunit/qunit/qunit.css" media="screen">
+ <script src="../../node_modules/qunit/qunit/qunit.js"></script>
<!-- Sinon -->
<script src="../../node_modules/sinon/pkg/sinon-no-sourcemaps.js"></script>
diff --git a/js/tests/karma.conf.js b/js/tests/karma.conf.js
index eceaa7ff7..3b438eaa0 100644
--- a/js/tests/karma.conf.js
+++ b/js/tests/karma.conf.js
@@ -66,6 +66,11 @@ module.exports = (config) => {
lines: 90
}
}
+ },
+ client: {
+ qunit: {
+ showUI: true
+ }
}
})
}
diff --git a/js/tests/unit/alert.js b/js/tests/unit/alert.js
index fc7727fb1..65a8f9e76 100644
--- a/js/tests/unit/alert.js
+++ b/js/tests/unit/alert.js
@@ -16,6 +16,7 @@ $(function () {
afterEach: function () {
$.fn.alert = $.fn.bootstrapAlert
delete $.fn.bootstrapAlert
+ $('#qunit-fixture').html('')
}
})
diff --git a/js/tests/unit/button.js b/js/tests/unit/button.js
index 1fdcce95f..9576dd256 100644
--- a/js/tests/unit/button.js
+++ b/js/tests/unit/button.js
@@ -16,6 +16,7 @@ $(function () {
afterEach: function () {
$.fn.button = $.fn.bootstrapButton
delete $.fn.bootstrapButton
+ $('#qunit-fixture').html('')
}
})
diff --git a/js/tests/unit/carousel.js b/js/tests/unit/carousel.js
index 12bb89e4f..baabcf426 100644
--- a/js/tests/unit/carousel.js
+++ b/js/tests/unit/carousel.js
@@ -16,6 +16,7 @@ $(function () {
afterEach: function () {
$.fn.carousel = $.fn.bootstrapCarousel
delete $.fn.bootstrapCarousel
+ $('#qunit-fixture').html('')
}
})
diff --git a/js/tests/unit/collapse.js b/js/tests/unit/collapse.js
index 4a99f1632..7f4cedd74 100644
--- a/js/tests/unit/collapse.js
+++ b/js/tests/unit/collapse.js
@@ -16,6 +16,7 @@ $(function () {
afterEach: function () {
$.fn.collapse = $.fn.bootstrapCollapse
delete $.fn.bootstrapCollapse
+ $('#qunit-fixture').html('')
}
})
diff --git a/js/tests/unit/dropdown.js b/js/tests/unit/dropdown.js
index f87c65bea..f767124d5 100644
--- a/js/tests/unit/dropdown.js
+++ b/js/tests/unit/dropdown.js
@@ -16,6 +16,7 @@ $(function () {
afterEach: function () {
$.fn.dropdown = $.fn.bootstrapDropdown
delete $.fn.bootstrapDropdown
+ $('#qunit-fixture').html('')
}
})
diff --git a/js/tests/unit/modal.js b/js/tests/unit/modal.js
index c8b321a7c..3932d66c7 100644
--- a/js/tests/unit/modal.js
+++ b/js/tests/unit/modal.js
@@ -33,6 +33,7 @@ $(function () {
$(document.body).removeClass('modal-open')
$.fn.modal = $.fn.bootstrapModal
delete $.fn.bootstrapModal
+ $('#qunit-fixture').html('')
}
})
diff --git a/js/tests/unit/popover.js b/js/tests/unit/popover.js
index 3eef811d6..f4b04ded5 100644
--- a/js/tests/unit/popover.js
+++ b/js/tests/unit/popover.js
@@ -17,6 +17,7 @@ $(function () {
$.fn.popover = $.fn.bootstrapPopover
delete $.fn.bootstrapPopover
$('.popover').remove()
+ $('#qunit-fixture').html('')
}
})
diff --git a/js/tests/unit/scrollspy.js b/js/tests/unit/scrollspy.js
index 095e744b7..1337e585d 100644
--- a/js/tests/unit/scrollspy.js
+++ b/js/tests/unit/scrollspy.js
@@ -16,6 +16,7 @@ $(function () {
afterEach: function () {
$.fn.scrollspy = $.fn.bootstrapScrollspy
delete $.fn.bootstrapScrollspy
+ $('#qunit-fixture').html('')
}
})
diff --git a/js/tests/unit/tab.js b/js/tests/unit/tab.js
index 5fb8d8d07..c70e0d1c9 100644
--- a/js/tests/unit/tab.js
+++ b/js/tests/unit/tab.js
@@ -16,6 +16,7 @@ $(function () {
afterEach: function () {
$.fn.tab = $.fn.bootstrapTab
delete $.fn.bootstrapTab
+ $('#qunit-fixture').html('')
}
})
diff --git a/js/tests/unit/tooltip.js b/js/tests/unit/tooltip.js
index a2a239530..e9e6ae324 100644
--- a/js/tests/unit/tooltip.js
+++ b/js/tests/unit/tooltip.js
@@ -17,6 +17,7 @@ $(function () {
$.fn.tooltip = $.fn.bootstrapTooltip
delete $.fn.bootstrapTooltip
$('.tooltip').remove()
+ $('#qunit-fixture').html('')
}
})
diff --git a/js/tests/unit/util.js b/js/tests/unit/util.js
index f4303ea15..37327b868 100644
--- a/js/tests/unit/util.js
+++ b/js/tests/unit/util.js
@@ -3,7 +3,11 @@ $(function () {
window.Util = typeof bootstrap !== 'undefined' ? bootstrap.Util : Util
- QUnit.module('util')
+ QUnit.module('util', {
+ afterEach: function () {
+ $('#qunit-fixture').html('')
+ }
+ })
QUnit.test('Util.getSelectorFromElement should return the correct element', function (assert) {
assert.expect(2)