summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2016-06-20 14:49:20 +0100
committerPhil Hughes <me@iamphill.com>2016-06-20 14:49:20 +0100
commit3e058a9f09435d374a8edb7069a730798c842bba (patch)
tree7b4c7119626c546b8a57b151e44d6507ed292067
parent03a4d6e9a2eef52181a70a68847aa27a2f82dcb2 (diff)
downloadgitlab-ce-3e058a9f09435d374a8edb7069a730798c842bba.tar.gz
Fixed award emoji tests
-rw-r--r--spec/javascripts/awards_handler_spec.js.coffee1
-rw-r--r--spec/javascripts/fixtures/emoji_menu.coffee2
2 files changed, 1 insertions, 2 deletions
diff --git a/spec/javascripts/awards_handler_spec.js.coffee b/spec/javascripts/awards_handler_spec.js.coffee
index ba191199dc7..d7f9c6fc076 100644
--- a/spec/javascripts/awards_handler_spec.js.coffee
+++ b/spec/javascripts/awards_handler_spec.js.coffee
@@ -160,7 +160,6 @@ describe 'AwardsHandler', ->
expect($('[data-emoji=angel]').is(':visible')).toBe no
expect($('[data-emoji=anger]').is(':visible')).toBe no
expect($('[data-emoji=alien]').is(':visible')).toBe yes
- expect($('h5.emoji-search').is(':visible')).toBe yes
describe 'emoji menu', ->
diff --git a/spec/javascripts/fixtures/emoji_menu.coffee b/spec/javascripts/fixtures/emoji_menu.coffee
index e529dd5f1cd..ce1a41390d2 100644
--- a/spec/javascripts/fixtures/emoji_menu.coffee
+++ b/spec/javascripts/fixtures/emoji_menu.coffee
@@ -1,7 +1,7 @@
window.emojiMenu = """
<div class='emoji-menu'>
+ <input type="text" name="emoji_search" id="emoji_search" value="" class="emoji-search search-input form-control" />
<div class='emoji-menu-content'>
- <input type="text" name="emoji_search" id="emoji_search" value="" class="emoji-search search-input form-control" />
<h5 class='emoji-menu-title'>
Emoticons
</h5>