Allow registered servers to receive options

README.md

@@ -106,7 +106,13 @@ Capybara.app = MyRackApp
 ```
 
 If you need to test JavaScript, or if your app interacts with (or is located at)
-a remote URL, you'll need to [use a different driver](#drivers).
+a remote URL, you'll need to [use a different driver](#drivers).  If using Rails 5.0+, but not using the Rails system tests from 5.1, you'll probably also
+want to swap the "server" used to launch your app to Puma in order to match Rails defaults.
+
+```ruby
+Capybara.server = :puma # Until your setup is working
+Capybara.server = :puma, { Silent: true } # To clean up your test output
+```
 
 ## <a name="using-capybara-with-cucumber"></a>Using Capybara with Cucumber
 

lib/capybara.rb

@@ -441,14 +441,14 @@ Capybara.register_server :default do |app, port, _host|
   Capybara.run_default_server(app, port)
 end
 
-Capybara.register_server :webrick do |app, port, host|
+Capybara.register_server :webrick do |app, port, host, options={}|
   require 'rack/handler/webrick'
-  Rack::Handler::WEBrick.run(app, Host: host, Port: port, AccessLog: [], Logger: WEBrick::Log::new(nil, 0))
+  Rack::Handler::WEBrick.run(app, {Host: host, Port: port, AccessLog: [], Logger: WEBrick::Log::new(nil, 0)}.merge(options))
 end
 
-Capybara.register_server :puma do |app, port, host|
+Capybara.register_server :puma do |app, port, host, options={}|
   require 'rack/handler/puma'
-  Rack::Handler::Puma.run(app, Host: host, Port: port, Threads: "0:4", workers: 0, daemon: false)
+  Rack::Handler::Puma.run(app, {Host: host, Port: port, Threads: "0:4", workers: 0, daemon: false}.merge(options))
 end
 
 Capybara.configure do |config|

lib/capybara/config.rb

@@ -51,17 +51,27 @@ module Capybara
     # Set the server to use.
     #
     #     Capybara.server = :webrick
+    #     Capybara.server = :puma, { Silent: true }
     #
+    # @overload server=(name)
     #   @param [Symbol] name     Name of the server type to use
+    # @overload server=([name, options])
+    #   @param [Symbol] name Name of the server type to use
+    #   @param [Hash] options Options to pass to the server block
     # @see register_server
     #
     def server=(name)
+      name, options = *name if name.is_a? Array
       @server = if name.respond_to? :call
         name
+      else
+        if options
+          Proc.new { |app, port, host| Capybara.servers[name.to_sym].call(app,port,host,options) }
         else
           Capybara.servers[name.to_sym]
         end
       end
+    end
 
     ##
     #

spec/capybara_spec.rb

@@ -92,9 +92,17 @@ RSpec.describe Capybara do
       require 'rack/handler/puma'
       mock_app = double('app')
       Capybara.server = :puma
-      expect(Rack::Handler::Puma).to receive(:run)
+      expect(Rack::Handler::Puma).to receive(:run).with(mock_app, hash_including(Host: nil, Port: 8000))
       Capybara.server.call(mock_app, 8000)
     end
+
+    it "should pass options to server" do
+      require 'rack/handler/puma'
+      mock_app = double('app')
+      Capybara.server = :puma, { Silent: true }
+      expect(Rack::Handler::Puma).to receive(:run).with(mock_app, hash_including(Host: nil, Port: 9000, Silent: true))
+      Capybara.server.call(mock_app, 9000)
+    end
   end
 
   describe 'app_host' do