Add latest changes from gitlab-org/gitlab@14-5-stable-eev14.5.0-rc42

1 files changed, 5 insertions, 4 deletions

diff --git a/spec/presenters/award_emoji_presenter_spec.rb b/spec/presenters/award_emoji_presenter_spec.rb
index 58ee985f165..a23196282a2 100644
--- a/spec/presenters/award_emoji_presenter_spec.rb
+++ b/spec/presenters/award_emoji_presenter_spec.rb
@@ -6,21 +6,22 @@ RSpec.describe AwardEmojiPresenter do
   let(:emoji_name) { 'thumbsup' }
   let(:award_emoji) { build(:award_emoji, name: emoji_name) }
   let(:presenter) { described_class.new(award_emoji) }
+  let(:emoji) { TanukiEmoji.find_by_alpha_code(emoji_name) }
 
   describe '#description' do
-    it { expect(presenter.description).to eq Gitlab::Emoji.emojis[emoji_name]['description'] }
+    it { expect(presenter.description).to eq emoji.description }
   end
 
   describe '#unicode' do
-    it { expect(presenter.unicode).to eq Gitlab::Emoji.emojis[emoji_name]['unicode'] }
+    it { expect(presenter.unicode).to eq emoji.hex }
   end
 
   describe '#unicode_version' do
-    it { expect(presenter.unicode_version).to eq Gitlab::Emoji.emoji_unicode_version(emoji_name) }
+    it { expect(presenter.unicode_version).to eq('6.0') }
   end
 
   describe '#emoji' do
-    it { expect(presenter.emoji).to eq Gitlab::Emoji.emojis[emoji_name]['moji'] }
+    it { expect(presenter.emoji).to eq emoji.codepoints }
   end
 
   describe 'when presenting an award emoji with an invalid name' do