Add latest changes from gitlab-org/gitlab@master

2 files changed, 33 insertions, 15 deletions

diff --git a/spec/helpers/emoji_helper_spec.rb b/spec/helpers/emoji_helper_spec.rb
new file mode 100644
index 00000000000..1b73e956f7a
--- /dev/null
+++ b/spec/helpers/emoji_helper_spec.rb
@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe EmojiHelper do
+  describe '#emoji_icon' do
+    let(:options) { {} }
+    let(:emoji_text) { 'rocket' }
+    let(:aria_hidden_option) { "aria-hidden=\"true\"" }
+
+    subject { helper.emoji_icon(emoji_text, options) }
+
+    it 'has no options' do
+      is_expected.to include('<gl-emoji',
+                             "title=\"#{emoji_text}\"",
+                             "data-name=\"#{emoji_text}\"",
+                             "data-unicode-version=\"#{::Gitlab::Emoji.emoji_unicode_version(emoji_text)}\"")
+      is_expected.not_to include(aria_hidden_option)
+    end
+
+    context 'with aria-hidden option' do
+      let(:options) { { 'aria-hidden': true } }
+
+      it 'applies aria-hidden' do
+        is_expected.to include('<gl-emoji',
+                               "title=\"#{emoji_text}\"",
+                               "data-name=\"#{emoji_text}\"",
+                               "data-unicode-version=\"#{::Gitlab::Emoji.emoji_unicode_version(emoji_text)}\"",
+                               aria_hidden_option)
+      end
+    end
+  end
+end
diff --git a/spec/workers/concerns/waitable_worker_spec.rb b/spec/workers/concerns/waitable_worker_spec.rb
index 1d76480ccb0..e7ef96c685d 100644
--- a/spec/workers/concerns/waitable_worker_spec.rb
+++ b/spec/workers/concerns/waitable_worker_spec.rb
@@ -58,21 +58,6 @@ describe WaitableWorker do
 
       worker.bulk_perform_and_wait(arguments, timeout: 2)
     end
-
-    context 'when the skip_job_waiter_for_large_batches flag is disabled' do
-      before do
-        stub_feature_flags(skip_job_waiter_for_large_batches: false)
-      end
-
-      it 'runs jobs over 10 * the timeout using a waiter key' do
-        arguments = 1.upto(21).map { |i| [i] }
-        arguments_with_waiter = arguments.map { |arg| arg + [anything] }
-
-        expect(worker).to receive(:bulk_perform_async).with(arguments_with_waiter)
-
-        worker.bulk_perform_and_wait(arguments, timeout: 2)
-      end
-    end
   end
 
   describe '.bulk_perform_inline' do