Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42

1 files changed, 13 insertions, 1 deletions

diff --git a/spec/lib/gitlab/runtime_spec.rb b/spec/lib/gitlab/runtime_spec.rb
index 1ec14092c63..0fcb7db7d5f 100644
--- a/spec/lib/gitlab/runtime_spec.rb
+++ b/spec/lib/gitlab/runtime_spec.rb
@@ -42,7 +42,19 @@ RSpec.describe Gitlab::Runtime do
     end
   end
 
-  context "puma" do
+  # Puma has no cli_config method unless `puma/cli` is required
+  context "puma without cli_config" do
+    let(:puma_type) { double('::Puma') }
+
+    before do
+      stub_const('::Puma', puma_type)
+      stub_env('ACTION_CABLE_IN_APP', 'false')
+    end
+
+    it_behaves_like "valid runtime", :puma, 1
+  end
+
+  context "puma with cli_config" do
     let(:puma_type) { double('::Puma') }
     let(:max_workers) { 2 }