Merge branch 'remove-awards-handler-spec-timeout' into 'master'

Remove timeout from awards_handler_spec.js See merge request !9822
2017-03-09 00:29:11 +00:00 · 2017-03-09 00:29:11 +00:00 · d643ba8b1f
parent 1110b2f18c f92a43c958
commit d643ba8b1f
1 changed files with 0 additions and 3 deletions
--- 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);
          }
        });
      };