diff options
| author | Mark Otto <[email protected]> | 2014-07-09 22:19:23 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-07-09 22:19:23 -0700 |
| commit | dae1a68fb15be9015760df32e85d764ef092db44 (patch) | |
| tree | 23dbce03ca690c069a35b3577377bff9a06cf432 /js/tests/unit/collapse.js | |
| parent | 216bc3d68b6a9016b3c5fdf90d82cbb291a28f96 (diff) | |
| parent | 643effe382bb12b4ff1460e9e1987948b1763990 (diff) | |
| download | bootstrap-dae1a68fb15be9015760df32e85d764ef092db44.tar.xz bootstrap-dae1a68fb15be9015760df32e85d764ef092db44.zip | |
Merge branch 'master' into derp
Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/_includes/components/navs.html
docs/_includes/css/images.html
docs/_includes/js/dropdowns.html
docs/_includes/js/tabs.html
docs/assets/css/docs.min.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
Diffstat (limited to 'js/tests/unit/collapse.js')
| -rw-r--r-- | js/tests/unit/collapse.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/tests/unit/collapse.js b/js/tests/unit/collapse.js index 976bdcd7b..8e6bb8273 100644 --- a/js/tests/unit/collapse.js +++ b/js/tests/unit/collapse.js @@ -33,14 +33,14 @@ $(function () { var $el = $('<div class="collapse"/>').bootstrapCollapse('show') ok($el.hasClass('in'), 'has class "in"') - ok(!/height/.test($el.attr('style')), 'has height reset') + ok(!/height/i.test($el.attr('style')), 'has height reset') }) test('should hide a collapsed element', function () { var $el = $('<div class="collapse"/>').bootstrapCollapse('hide') ok(!$el.hasClass('in'), 'does not have class "in"') - ok(/height/.test($el.attr('style')), 'has height set') + ok(/height/i.test($el.attr('style')), 'has height set') }) test('should not fire shown when show is prevented', function () { |