remove deprecated support for Capybara.server taking a block

lib/capybara.rb

@@ -128,7 +128,6 @@ module Capybara
     # @yieldparam [<Rack>] app                The rack application that this server will contain.
     # @yieldparam port                        The port number the server should listen on
     # @yieldparam host                        The host/ip to bind to
-    # @yieldreturn [Capybara::Driver::Base]   A Capybara driver instance
     #
     def register_server(name, &block)
       servers[name.to_sym] = block
@@ -192,8 +191,6 @@ module Capybara
       @servers ||= {}
     end
 
-    ##
-    #
     # Wraps the given string, which should contain an HTML document or fragment
     # in a {Capybara::Node::Simple} which exposes all {Capybara::Node::Matchers},
     # {Capybara::Node::Finders} and {Capybara::Node::DocumentMatchers}. This allows you to query

lib/capybara/config.rb

@@ -38,12 +38,7 @@ module Capybara
     # By default, Capybara will try to run webrick.
     #
     def server(&block)
-      if block_given?
-        warn "DEPRECATED: Passing a block to Capybara::server is deprecated, please use Capybara::register_server instead"
-        @server = block
-      else
-        @server
-      end
+      @server
     end
 
     ##
@@ -62,14 +57,10 @@ module Capybara
     #
     def server=(name)
       name, options = *name if name.is_a? Array
-      @server = if name.respond_to? :call
-        name
+      @server = if options
+        Proc.new { |app, port, host| Capybara.servers[name.to_sym].call(app,port,host,options) }
       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
+        Capybara.servers[name.to_sym]
       end
     end
 

spec/capybara_spec.rb

@@ -46,12 +46,8 @@ RSpec.describe Capybara do
   end
 
   describe ".server" do
-    before do
-      @old_server = Capybara.server
-    end
-
     after do
-      Capybara.server(&@old_server)
+      Capybara.server = :default
     end
 
     it "should default to a proc that calls run_default_server" do
@@ -62,7 +58,8 @@ RSpec.describe Capybara do
 
     it "should return a custom server proc" do
       server = lambda {|app, port|}
-      Capybara.server(&server)
+      Capybara.register_server :custom, &server
+      Capybara.server = :custom
       expect(Capybara.server).to eq(server)
     end