aboutsummaryrefslogtreecommitdiff
path: root/js/tests/unit
diff options
context:
space:
mode:
authorJohann-S <[email protected]>2018-03-29 22:16:56 +0200
committerMark Otto <[email protected]>2018-03-29 21:21:31 -0700
commitfd57d371f84e2aeac35d5701ae3ad357ad6456b2 (patch)
treee0772bb5460303622156d4024f9cb652234d5109 /js/tests/unit
parent9cdb7a83010dbdc29d1910bda94ca50711168a48 (diff)
downloadbootstrap-fd57d371f84e2aeac35d5701ae3ad357ad6456b2.tar.xz
bootstrap-fd57d371f84e2aeac35d5701ae3ad357ad6456b2.zip
fix bundle and run test against it
Diffstat (limited to 'js/tests/unit')
-rw-r--r--js/tests/unit/.eslintrc.json3
-rw-r--r--js/tests/unit/util.js2
2 files changed, 4 insertions, 1 deletions
diff --git a/js/tests/unit/.eslintrc.json b/js/tests/unit/.eslintrc.json
index 02dc9c9a4..f03726543 100644
--- a/js/tests/unit/.eslintrc.json
+++ b/js/tests/unit/.eslintrc.json
@@ -6,7 +6,8 @@
},
"globals": {
"sinon": false,
- "Util": false
+ "Util": false,
+ "bootstrap": false
},
"parserOptions": {
"ecmaVersion": 5,
diff --git a/js/tests/unit/util.js b/js/tests/unit/util.js
index 9a25a5286..f4303ea15 100644
--- a/js/tests/unit/util.js
+++ b/js/tests/unit/util.js
@@ -1,6 +1,8 @@
$(function () {
'use strict'
+ window.Util = typeof bootstrap !== 'undefined' ? bootstrap.Util : Util
+
QUnit.module('util')
QUnit.test('Util.getSelectorFromElement should return the correct element', function (assert) {