diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-06-10 02:41:45 +0300 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-06-10 02:41:45 +0300 |
| commit | 7bad6814b16ae9c4fec55234e7187acc21e94e52 (patch) | |
| tree | 908e6cef1152147b7a2538771b5e2e0fa65886cc /spec/javascripts | |
| parent | d9e3a6a06822c95ad2c23d9fb50e34d1528ca7f7 (diff) | |
| parent | cea3cf177c68bb1fa9326d4e88631b7737ae8a98 (diff) | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into category-search-dropdown
Diffstat (limited to 'spec/javascripts')
| -rw-r--r-- | spec/javascripts/awards_handler_spec.js.coffee | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/spec/javascripts/awards_handler_spec.js.coffee b/spec/javascripts/awards_handler_spec.js.coffee index 0bd6d696387..ba191199dc7 100644 --- a/spec/javascripts/awards_handler_spec.js.coffee +++ b/spec/javascripts/awards_handler_spec.js.coffee @@ -3,10 +3,11 @@ #= require jquery.cookie #= require ./fixtures/emoji_menu -awardsHandler = null -window.gl or= {} -gl.emojiAliases = -> return { '+1': 'thumbsup', '-1': 'thumbsdown' } -gl.awardMenuUrl = '/emojis' +awardsHandler = null +window.gl or= {} +window.gon or= {} +gl.emojiAliases = -> return { '+1': 'thumbsup', '-1': 'thumbsdown' } +gon.award_menu_url = '/emojis' lazyAssert = (done, assertFn) -> @@ -25,9 +26,7 @@ describe 'AwardsHandler', -> fixture.load 'awards_handler.html' awardsHandler = new AwardsHandler spyOn(awardsHandler, 'postEmoji').and.callFake (url, emoji, cb) => cb() - spyOn(jQuery, 'get').and.callFake (req, cb) -> - expect(req).toBe '/emojis' - cb window.emojiMenu + spyOn(jQuery, 'get').and.callFake (req, cb) -> cb window.emojiMenu describe '::showEmojiMenu', -> |