Ensure puma config load process is respected

Author: joshuay03

lib/capybara/registrations/servers.rb

@@ -38,9 +38,11 @@
   # Therefore construct and run the Server instance ourselves.
   # puma_rack_handler.run(app, { Host: host, Port: port, Threads: "0:4", workers: 0, daemon: false }.merge(options))
   default_options = { Host: host, Port: port, Threads: '0:4', workers: 0, daemon: false }
-  options = default_options.merge(options)
+  override_options = { config_files: ['-'] }
+  options = default_options.merge(options).merge(override_options)
 
   conf = puma_rack_handler.config(app, options)
+  conf.load
   conf.clamp
 
   puma_ver = Gem::Version.new(Puma::Const::PUMA_VERSION)

spec/server_spec.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'spec_helper'
+require 'puma'
 
 RSpec.describe Capybara::Server do
   it 'should spool up a rack server' do
@@ -102,7 +103,6 @@
   it 'should call #clamp on the puma configuration to ensure that environment is a string' do
     Capybara.server = :puma
     app_proc = proc { |_env| [200, {}, ['Hello Puma!']] }
-    require 'puma'
     allow(Puma::Server).to receive(:new).and_wrap_original do |method, app, events, options|
       # If #clamp is not called on the puma config then this will be a Proc
       expect(options.fetch(:environment)).to be_a(String)
@@ -118,6 +118,25 @@
     Capybara.server = :default
   end
 
+  it 'should ignore puma config files' do
+    Capybara.server = :puma
+    Dir.mkdir('config') unless Dir.exist?('config')
+    File.open('config/puma.rb', 'w') do |file|
+      file.puts 'debug' # puma default is debug: false, which we don't override
+    end
+    allow(Puma::Server).to receive(:new).and_call_original
+    app_proc = proc { |_env| [200, {}, ['Hello Puma!']] }
+    server = described_class.new(app_proc).boot
+    expect(Puma::Server).to have_received(:new).with(
+      anything,
+      anything,
+      satisfy { |opts| opts.final_options[:debug] == false }
+    )
+  ensure
+    Capybara.server = :default
+    FileUtils.rm_rf('config')
+  end
+
   it 'should not emit any warnings when booting puma' do
     Capybara.server = :puma
     app_proc = proc { |_env| [200, {}, ['Hello Puma!']] }