Fix specs againcomment-award-emoji

2 files changed, 7 insertions, 3 deletions

diff --git a/features/steps/project/issues/issues.rb b/features/steps/project/issues/issues.rb
index af46df2d0f4..5b5631c92fb 100644
--- a/features/steps/project/issues/issues.rb
+++ b/features/steps/project/issues/issues.rb
@@ -192,14 +192,14 @@ class Spinach::Features::ProjectIssues < Spinach::FeatureSteps
 
   step 'issue "Release 0.4" have 2 upvotes and 1 downvote' do
     issue = Issue.find_by(title: 'Release 0.4')
-    create_list(:award_emoji, :upvote, 2, awardable: issue)
+    create_list(:award_emoji, 2, awardable: issue, name: "thumbsup")
     create(:award_emoji, :downvote, awardable: issue)
   end
 
   step 'issue "Tweet control" have 1 upvote and 2 downvotes' do
     issue = Issue.find_by(title: 'Tweet control')
     create(:award_emoji, :upvote, awardable: issue)
-    create_list(:award_emoji, :downvote,  2, awardable: issue)
+    create_list(:award_emoji, 2, awardable: issue, name: "thumbsdown")
   end
 
   step 'The list should be sorted by "Least popular"' do
diff --git a/spec/services/issues/move_service_spec.rb b/spec/services/issues/move_service_spec.rb
index 4204783f753..8bfc47011a5 100644
--- a/spec/services/issues/move_service_spec.rb
+++ b/spec/services/issues/move_service_spec.rb
@@ -129,7 +129,11 @@ describe Issues::MoveService, services: true do
           end
 
           it 'moves the award emoji too' do
-            expect(new_issue.award_emoji).to eq(old_issue.award_emoji)
+            new_issue.reload
+            first_emoji = new_issue.award_emoji.first
+
+            expect(new_issue.award_emoji.count).to eq(old_issue.award_emoji.count)
+            expect(first_emoji.name).to eq(old_issue.award_emoji.first.name)
           end
         end