diff options
| author | Johann-S <[email protected]> | 2019-04-15 12:00:26 +0200 |
|---|---|---|
| committer | Johann-S <[email protected]> | 2019-04-15 13:48:27 +0200 |
| commit | 14f53d9baa80807486dad0314654f8c19b1b9635 (patch) | |
| tree | 6a3060d265360cb20bff346a16de87847461b5e0 /js | |
| parent | 80dfee9dc1ca1cd6c00bcc4509109b06b50de54b (diff) | |
| download | bootstrap-14f53d9baa80807486dad0314654f8c19b1b9635.tar.xz bootstrap-14f53d9baa80807486dad0314654f8c19b1b9635.zip | |
fix unit tests for chrome mobile
Diffstat (limited to 'js')
| -rw-r--r-- | js/tests/unit/modal.js | 2 | ||||
| -rw-r--r-- | js/tests/unit/scrollspy.js | 16 |
2 files changed, 13 insertions, 5 deletions
diff --git a/js/tests/unit/modal.js b/js/tests/unit/modal.js index 82b37f236..0137802ed 100644 --- a/js/tests/unit/modal.js +++ b/js/tests/unit/modal.js @@ -800,7 +800,7 @@ $(function () { var $modalBody = $('.modal-body') $modalBody.scrollTop(100) - assert.strictEqual($modalBody.scrollTop(), 100) + assert.ok($modalBody.scrollTop() > 95 && $modalBody.scrollTop() <= 100) $modal.on('shown.bs.modal', function () { assert.strictEqual($modalBody.scrollTop(), 0, 'modal body scrollTop should be 0 when opened') diff --git a/js/tests/unit/scrollspy.js b/js/tests/unit/scrollspy.js index 41a155b7a..d191150f1 100644 --- a/js/tests/unit/scrollspy.js +++ b/js/tests/unit/scrollspy.js @@ -203,7 +203,9 @@ $(function () { var done = assert.async() var testElementIsActiveAfterScroll = function (element, target) { var deferred = $.Deferred() - var scrollHeight = Math.ceil($content.scrollTop() + $(target).position().top) + // add top padding to fix Chrome on Android failures + var paddingTop = 5 + var scrollHeight = Math.ceil($content.scrollTop() + $(target).position().top) + paddingTop $content.one('scroll', function () { assert.ok($(element).hasClass('active'), 'target:' + target + ', element' + element) deferred.resolve() @@ -247,7 +249,9 @@ $(function () { var done = assert.async() var testElementIsActiveAfterScroll = function (element, target) { var deferred = $.Deferred() - var scrollHeight = Math.ceil($content.scrollTop() + $(target).position().top) + // add top padding to fix Chrome on Android failures + var paddingTop = 5 + var scrollHeight = Math.ceil($content.scrollTop() + $(target).position().top) + paddingTop $content.one('scroll', function () { assert.ok($(element).hasClass('active'), 'target:' + target + ', element' + element) deferred.resolve() @@ -291,7 +295,9 @@ $(function () { var done = assert.async() var testElementIsActiveAfterScroll = function (element, target) { var deferred = $.Deferred() - var scrollHeight = Math.ceil($content.scrollTop() + $(target).position().top) + // add top padding to fix Chrome on Android failures + var paddingTop = 5 + var scrollHeight = Math.ceil($content.scrollTop() + $(target).position().top) + paddingTop $content.one('scroll', function () { assert.ok($(element).hasClass('active'), 'target:' + target + ', element' + element) deferred.resolve() @@ -606,7 +612,9 @@ $(function () { var testElementIsActiveAfterScroll = function (element, target) { var deferred = $.Deferred() - var scrollHeight = Math.ceil($content.scrollTop() + $(target).position().top) + // add top padding to fix Chrome on Android failures + var paddingTop = 5 + var scrollHeight = Math.ceil($content.scrollTop() + $(target).position().top) + paddingTop $content.one('scroll', function () { assert.ok($(element).hasClass('active'), 'target:' + target + ', element: ' + element) deferred.resolve() |