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

1 files changed, 4 insertions, 2 deletions

diff --git a/spec/lib/banzai/pipeline/emoji_pipeline_spec.rb b/spec/lib/banzai/pipeline/emoji_pipeline_spec.rb
index 6de9d65f1b2..8103846d4f7 100644
--- a/spec/lib/banzai/pipeline/emoji_pipeline_spec.rb
+++ b/spec/lib/banzai/pipeline/emoji_pipeline_spec.rb
@@ -3,18 +3,20 @@
 require 'spec_helper'
 
 RSpec.describe Banzai::Pipeline::EmojiPipeline do
+  let(:emoji) { TanukiEmoji.find_by_alpha_code('100') }
+
   def parse(text)
     described_class.to_html(text, {})
   end
 
   it 'replaces emoji' do
-    expected_result = "Hello world #{Gitlab::Emoji.gl_emoji_tag('100')}"
+    expected_result = "Hello world #{Gitlab::Emoji.gl_emoji_tag(emoji)}"
 
     expect(parse('Hello world :100:')).to eq(expected_result)
   end
 
   it 'filters out HTML tags' do
-    expected_result = "Hello <b>world</b> #{Gitlab::Emoji.gl_emoji_tag('100')}"
+    expected_result = "Hello <b>world</b> #{Gitlab::Emoji.gl_emoji_tag(emoji)}"
 
     expect(parse('Hello <b>world</b> :100:')).to eq(expected_result)
   end