From 212ecdcfdfd78c3409fad63160b981b8b3ece6f2 Mon Sep 17 00:00:00 2001
From: Thomas Walpole <twalpole@gmail.com>
Date: Tue, 8 Aug 2017 05:33:20 -0700
Subject: [PATCH] parameter cleanup

---
 lib/capybara.rb                     | 4 ++--
 lib/capybara/selector/filter_set.rb | 2 +-
 lib/capybara/session.rb             | 9 +++------
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/lib/capybara.rb b/lib/capybara.rb
index 122cd711..2a9bcb4b 100644
--- a/lib/capybara.rb
+++ b/lib/capybara.rb
@@ -436,12 +436,12 @@ Capybara.register_server :default do |app, port, _host|
   Capybara.run_default_server(app, port)
 end
 
-Capybara.register_server :webrick do |app, port, host, options={}|
+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)}.merge(options))
 end
 
-Capybara.register_server :puma do |app, port, host, options={}|
+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}.merge(options))
 end
diff --git a/lib/capybara/selector/filter_set.rb b/lib/capybara/selector/filter_set.rb
index f918ed0c..51c577b9 100644
--- a/lib/capybara/selector/filter_set.rb
+++ b/lib/capybara/selector/filter_set.rb
@@ -24,7 +24,7 @@ module Capybara
         descriptions.push block
       end
 
-      def description(options={})
+      def description(**options)
         options_with_defaults = options.dup
         filters.each do |name, filter|
           options_with_defaults[name] = filter.default if filter.default? && !options_with_defaults.has_key?(name)
diff --git a/lib/capybara/session.rb b/lib/capybara/session.rb
index 884a4486..6e410ffc 100644
--- a/lib/capybara/session.rb
+++ b/lib/capybara/session.rb
@@ -847,9 +847,8 @@ module Capybara
       driver.dismiss_modal(type, modal_options(text_or_options, options), &blk)
     end
 
-    def modal_options(text_or_options, options)
-      text_or_options, options = nil, text_or_options if text_or_options.is_a?(Hash)
-      options[:text] ||= text_or_options unless text_or_options.nil?
+    def modal_options(text=nil, **options)
+      options[:text] ||= text unless text.nil?
       options[:wait] ||= config.default_max_wait_time
       options
     end
@@ -908,9 +907,7 @@ module Capybara
       end
     end
 
-    def _switch_to_window(window = nil, options= {})
-      options, window = window, nil if window.is_a? Hash
-
+    def _switch_to_window(window = nil, **options)
       raise Capybara::ScopeError, "Window cannot be switched inside a `within_frame` block" if scopes.include?(:frame)
       raise Capybara::ScopeError, "Window cannot be switch inside a `within` block" unless scopes.last.nil?