Merge remote-tracking branch 'origin/master' into dockerfile-templatesdockerfile-templates

1 files changed, 7 insertions, 6 deletions

diff --git a/spec/javascripts/awards_handler_spec.js b/spec/javascripts/awards_handler_spec.js
index 3d705e1cb2e..89201c8cb8b 100644
--- a/spec/javascripts/awards_handler_spec.js
+++ b/spec/javascripts/awards_handler_spec.js
@@ -1,4 +1,5 @@
-/* eslint-disable */
+/* 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, padded-blocks, max-len */
+/* global AwardsHandler */
 
 /*= require awards_handler */
 /*= require jquery */
@@ -33,9 +34,9 @@
   };
 
   describe('AwardsHandler', function() {
-    fixture.preload('awards_handler.html');
+    fixture.preload('issues/open-issue.html.raw');
     beforeEach(function() {
-      fixture.load('awards_handler.html');
+      fixture.load('issues/open-issue.html.raw');
       awardsHandler = new AwardsHandler;
       spyOn(awardsHandler, 'postEmoji').and.callFake((function(_this) {
         return function(url, emoji, cb) {
@@ -113,7 +114,7 @@
     });
     describe('::getAwardUrl', function() {
       return it('should return the url for request', function() {
-        return expect(awardsHandler.getAwardUrl()).toBe('/gitlab-org/gitlab-test/issues/8/toggle_award_emoji');
+        return expect(awardsHandler.getAwardUrl()).toBe('http://test.host/frontend-fixtures/issues-project/issues/1/toggle_award_emoji');
       });
     });
     describe('::addAward and ::checkMutuality', function() {
@@ -209,7 +210,7 @@
         $('.js-add-award').eq(0).click();
         $menu = $('.emoji-menu');
         $block = $('.js-awards-block');
-        $emoji = $menu.find(".emoji-menu-list-item " + selector);
+        $emoji = $menu.find('.emoji-menu-list:not(.frequent-emojis) ' + selector);
         expect($emoji.length).toBe(1);
         expect($block.find(selector).length).toBe(0);
         $emoji.click();
@@ -224,7 +225,7 @@
         openEmojiMenuAndAddEmoji();
         $('.js-add-award').eq(0).click();
         $block = $('.js-awards-block');
-        $emoji = $('.emoji-menu').find(".emoji-menu-list-item " + selector);
+        $emoji = $('.emoji-menu').find(".emoji-menu-list:not(.frequent-emojis) " + selector);
         $emoji.click();
         return expect($block.find(selector).length).toBe(0);
       });