Add latest changes from gitlab-org/gitlab@15-1-stable-eev15.1.0-rc42

1 files changed, 25 insertions, 0 deletions

diff --git a/spec/lib/gitlab/render_timeout_spec.rb b/spec/lib/gitlab/render_timeout_spec.rb
new file mode 100644
index 00000000000..f322d71867b
--- /dev/null
+++ b/spec/lib/gitlab/render_timeout_spec.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Gitlab::RenderTimeout do
+  def expect_timeout(period)
+    block = proc {}
+
+    expect(Timeout).to receive(:timeout).with(period) do |_, &block|
+      expect(block).to eq(block)
+    end
+
+    described_class.timeout(&block)
+  end
+
+  it 'utilizes timeout for web' do
+    expect_timeout(described_class::FOREGROUND)
+  end
+
+  it 'utilizes longer timeout for sidekiq' do
+    allow(Gitlab::Runtime).to receive(:sidekiq?).and_return(true)
+
+    expect_timeout(described_class::BACKGROUND)
+  end
+end