From a7e76a6119b4f51bdb29ea1420c151081cd12d77 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Tue, 1 Mar 2016 13:00:26 +0000
Subject: [PATCH] Updated award emoji tests

---
 app/assets/javascripts/awards_handler.coffee |  2 +-
 features/steps/project/issues/award_emoji.rb | 26 ++++++++++----------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/app/assets/javascripts/awards_handler.coffee b/app/assets/javascripts/awards_handler.coffee
index 351f871de94..829340dea6e 100644
--- a/app/assets/javascripts/awards_handler.coffee
+++ b/app/assets/javascripts/awards_handler.coffee
@@ -82,7 +82,7 @@ class @AwardsHandler
     award_block = @findEmojiIcon(emoji).parent()
     authors = award_block.attr("data-original-title").split(", ")
     authors.splice(authors.indexOf("me"),1)
-    award_block.closest(".award").attr("data-original-title", authors.join(", "))
+    award_block.closest(".js-emoji-btn").attr("data-original-title", authors.join(", "))
     @resetTooltip(award_block)
 
   addMeToAuthorList: (emoji) ->
diff --git a/features/steps/project/issues/award_emoji.rb b/features/steps/project/issues/award_emoji.rb
index 277c63914d1..9f0f1812b46 100644
--- a/features/steps/project/issues/award_emoji.rb
+++ b/features/steps/project/issues/award_emoji.rb
@@ -10,7 +10,7 @@ class Spinach::Features::AwardEmoji < Spinach::FeatureSteps
 
   step 'I click the thumbsup award Emoji' do
     page.within '.awards' do
-      thumbsup = page.find('.award .emoji-1F44D')
+      thumbsup = page.first('.award-control')
       thumbsup.click
       thumbsup.hover
       sleep 0.3
@@ -18,23 +18,23 @@ class Spinach::Features::AwardEmoji < Spinach::FeatureSteps
   end
 
   step 'I click to emoji-picker' do
-    page.within '.awards-controls' do
-      page.find('.add-award').click
+    page.within '.awards' do
+      page.find('.js-add-award').click
     end
   end
 
   step 'I click to emoji in the picker' do
     page.within '.emoji-menu-content' do
-      page.first('.emoji-icon').click
+      page.first('.js-emoji-btn').click
     end
   end
 
   step 'I can remove it by clicking to icon' do
     page.within '.awards' do
       expect do
-        page.find('.award.active').click
+        page.find('.js-emoji-btn.active').click
         sleep 0.3
-      end.to change{ page.all(".award").size }.from(3).to(2)
+      end.to change{ page.all(".award-control.js-emoji-btn").size }.from(3).to(2)
     end
   end
 
@@ -49,23 +49,23 @@ class Spinach::Features::AwardEmoji < Spinach::FeatureSteps
     sleep 0.2
 
     page.within '.awards' do
-      expect(page).to have_selector '.award'
-      expect(page.find('.award.active .counter')).to have_content '1'
-      expect(page.find('.award.active')['data-original-title']).to eq('me')
+      expect(page).to have_selector '.js-emoji-btn'
+      expect(page.find('.js-emoji-btn.active .js-counter')).to have_content '1'
+      expect(page.find('.js-emoji-btn.active')['data-original-title']).to eq('me')
     end
   end
 
   step 'I have no awards added' do
     page.within '.awards' do
-      expect(page).to have_selector '.award'
-      expect(page.all('.award').size).to eq(2)
+      expect(page).to have_selector '.award-control.js-emoji-btn'
+      expect(page.all('.award-control.js-emoji-btn').size).to eq(2)
 
       # Check tooltip data
-      page.all('.award').each do |element|
+      page.all('.award-control.js-emoji-btn').each do |element|
         expect(element['title']).to eq("")
       end
 
-      page.all('.award .counter').each do |element|
+      page.all('.award-control .js-counter').each do |element|
         expect(element).to have_content '0'
       end
     end