Merge branch '35530-teleporting-emoji-fix' into 'master'

Fix teleporting emoji (MR description instead of comment)

Closes #35530

See merge request gitlab-org/gitlab-ce!17100

1 files changed, 12 insertions, 1 deletions

diff --git a/spec/javascripts/awards_handler_spec.js b/spec/javascripts/awards_handler_spec.js
index 268b5b83b73..1c1b3f3ced3 100644
--- a/spec/javascripts/awards_handler_spec.js
+++ b/spec/javascripts/awards_handler_spec.js
@@ -79,7 +79,7 @@ import '~/lib/utils/common_utils';
           return expect($emojiMenu.length).toBe(1);
         });
       });
-      return it('should remove emoji menu when body is clicked', function(done) {
+      it('should remove emoji menu when body is clicked', function(done) {
         $('.js-add-award').eq(0).click();
         return lazyAssert(done, function() {
           var $emojiMenu;
@@ -90,6 +90,17 @@ import '~/lib/utils/common_utils';
           return expect($('.js-awards-block.current').length).toBe(0);
         });
       });
+      it('should not remove emoji menu when search is clicked', function(done) {
+        $('.js-add-award').eq(0).click();
+        return lazyAssert(done, function() {
+          var $emojiMenu;
+          $emojiMenu = $('.emoji-menu');
+          $('.emoji-search').click();
+          expect($emojiMenu.length).toBe(1);
+          expect($emojiMenu.hasClass('is-visible')).toBe(true);
+          return expect($('.js-awards-block.current').length).toBe(1);
+        });
+      });
     });
     describe('::addAwardToEmojiBar', function() {
       it('should add emoji to votes block', function() {