diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2017-03-09 00:29:11 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2017-03-09 00:29:11 +0000 |
| commit | d643ba8b1f9a682ae385895c395a8ad3910a415d (patch) | |
| tree | 29fd2e721c2bed1e2f0c0f3ba34884d86a62d50b | |
| parent | 1110b2f18c1a5397df71979fcc3fc8fabe87576d (diff) | |
| parent | f92a43c95867e054ef9fe7c6c8f7399261c7bf51 (diff) | |
| download | gitlab-ce-d643ba8b1f9a682ae385895c395a8ad3910a415d.tar.gz | |
Merge branch 'remove-awards-handler-spec-timeout' into 'master'
Remove timeout from awards_handler_spec.js
See merge request !9822
| -rw-r--r-- | spec/javascripts/awards_handler_spec.js | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/spec/javascripts/awards_handler_spec.js b/spec/javascripts/awards_handler_spec.js index f4b1d777203..d8517e4d3d1 100644 --- a/spec/javascripts/awards_handler_spec.js +++ b/spec/javascripts/awards_handler_spec.js @@ -46,9 +46,6 @@ const AwardsHandler = require('~/awards_handler'); isEmojiMenuBuilt = true; resolve(); }); - - // Fail after 1 second - setTimeout(reject, 1000); } }); }; |