diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-03-09 20:39:26 +0300 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-03-09 20:39:26 +0300 |
| commit | d163ac26c50eaa371f5e6afa9281837cd10d2cc9 (patch) | |
| tree | 72c56ad11c3e4816177d6df30f31e3f8b553417d /spec/javascripts/awards_handler_spec.js | |
| parent | 92bb0d8fc2e9331574ae7d4f235a2e93cc72fa26 (diff) | |
| parent | ee9930145fafdd3869ecf985f0b2295081ac3c7e (diff) | |
Merge branch 'update-native-unicode-emojis-with-harmony-modules' into 'master'
Update emojis to use harmony modules (import/export)
See merge request !9784
Diffstat (limited to 'spec/javascripts/awards_handler_spec.js')
| -rw-r--r-- | spec/javascripts/awards_handler_spec.js | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/spec/javascripts/awards_handler_spec.js b/spec/javascripts/awards_handler_spec.js index d8517e4d3d1..dc0a62ade50 100644 --- a/spec/javascripts/awards_handler_spec.js +++ b/spec/javascripts/awards_handler_spec.js @@ -1,8 +1,9 @@ /* eslint-disable space-before-function-paren, no-var, one-var, one-var-declaration-per-line, no-unused-expressions, comma-dangle, new-parens, no-unused-vars, quotes, jasmine/no-spec-dupes, prefer-template, max-len */ -require('es6-promise').polyfill(); +import promisePolyfill from 'es6-promise'; +import AwardsHandler from '~/awards_handler'; -const AwardsHandler = require('~/awards_handler'); +promisePolyfill.polyfill(); (function() { var awardsHandler, lazyAssert, urlRoot, openAndWaitForEmojiMenu; |