diff options
| author | James Lopez <james@gitlab.com> | 2017-02-16 18:01:13 +0000 |
|---|---|---|
| committer | James Lopez <james@gitlab.com> | 2017-02-16 18:01:13 +0000 |
| commit | 153f164a528972fc6654aa54e6bcee79364b224f (patch) | |
| tree | 9fa41e4b157c098cf6a32922ac5c3ada4955fd7a | |
| parent | 2917d042c295cffb2ea1d131fa33c4ebc2510eda (diff) | |
| parent | 872ac22439d2540e3c4c380d3c80c1ef653c648b (diff) | |
| download | gitlab-ce-153f164a528972fc6654aa54e6bcee79364b224f.tar.gz | |
Merge branch 'fix-smart-interval-not-larger-than' into '8-16-stable'
Fix smart interval 8-16-stable failure
See merge request !9310
| -rw-r--r-- | spec/javascripts/smart_interval_spec.js.es6 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/javascripts/smart_interval_spec.js.es6 b/spec/javascripts/smart_interval_spec.js.es6 index 39d236986b9..e2d8549147b 100644 --- a/spec/javascripts/smart_interval_spec.js.es6 +++ b/spec/javascripts/smart_interval_spec.js.es6 @@ -54,7 +54,7 @@ setTimeout(() => { const currentInterval = interval.getCurrentInterval(); - expect(currentInterval).toBe(interval.cfg.maxInterval); + expect(currentInterval).toBeLessThan(interval.cfg.maxInterval); done(); }, DEFAULT_LONG_TIMEOUT); |