aboutsummaryrefslogtreecommitdiff
path: root/js/tests/unit/transition.js
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-12-14 15:38:21 -0800
committerMark Otto <[email protected]>2013-12-14 15:38:21 -0800
commita54dbfdf2a08ff04fc65f8e4f77ee5dc76bf4ef3 (patch)
tree9b1c5697a731543a86711b016e1986ec1e81dad4 /js/tests/unit/transition.js
parent80e86442308b2cc86ba948de87e854057933e3ab (diff)
parentf1869771bc8b8e8a6c7a98385ec58e0bf0d2d98e (diff)
downloadbootstrap-a54dbfdf2a08ff04fc65f8e4f77ee5dc76bf4ef3.tar.xz
bootstrap-a54dbfdf2a08ff04fc65f8e4f77ee5dc76bf4ef3.zip
Merge branch 'master' into pr/10951
Conflicts: dist/css/bootstrap.min.css less/modals.less
Diffstat (limited to 'js/tests/unit/transition.js')
-rw-r--r--js/tests/unit/transition.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/js/tests/unit/transition.js b/js/tests/unit/transition.js
index 39c415bc2..79722f808 100644
--- a/js/tests/unit/transition.js
+++ b/js/tests/unit/transition.js
@@ -1,12 +1,12 @@
$(function () {
- module("transition")
+ module('transition')
- test("should be defined on jquery support object", function () {
+ test('should be defined on jquery support object', function () {
ok($.support.transition !== undefined, 'transition object is defined')
})
- test("should provide an end object", function () {
+ test('should provide an end object', function () {
ok($.support.transition ? $.support.transition.end : true, 'end string is defined')
})