From c8606a4c9cc375d8b8876647cbd087fba9e2157a Mon Sep 17 00:00:00 2001
From: Thomas Walpole <twalpole@gmail.com>
Date: Fri, 24 Aug 2018 04:45:19 -0700
Subject: [PATCH] refactor selenium driver/node

---
 lib/capybara/selenium/driver.rb | 29 ++++++++++++++++-------------
 lib/capybara/selenium/node.rb   |  8 +++-----
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/lib/capybara/selenium/driver.rb b/lib/capybara/selenium/driver.rb
index 41cbfa7b..2a7e59b3 100644
--- a/lib/capybara/selenium/driver.rb
+++ b/lib/capybara/selenium/driver.rb
@@ -313,20 +313,23 @@ private
   end
 
   def clear_storage
-    if options[:clear_session_storage]
-      if @browser.respond_to? :session_storage
-        @browser.session_storage.clear
-      else
-        warn 'sessionStorage clear requested but is not available for this driver'
-      end
-    end
+    clear_session_storage if options[:clear_session_storage]
+    clear_local_storage if options[:clear_local_storage]
+  end
 
-    if options[:clear_local_storage] # rubocop:disable Style/GuardClause
-      if @browser.respond_to? :local_storage
-        @browser.local_storage.clear
-      else
-        warn 'localStorage clear requested but is not available for this driver'
-      end
+  def clear_session_storage
+    if @browser.respond_to? :session_storage
+      @browser.session_storage.clear
+    else
+      warn 'sessionStorage clear requested but is not available for this driver'
+    end
+  end
+
+  def clear_local_storage
+    if @browser.respond_to? :local_storage
+      @browser.local_storage.clear
+    else
+      warn 'localStorage clear requested but is not available for this driver'
     end
   end
 
diff --git a/lib/capybara/selenium/node.rb b/lib/capybara/selenium/node.rb
index c9285165..b7037061 100644
--- a/lib/capybara/selenium/node.rb
+++ b/lib/capybara/selenium/node.rb
@@ -74,12 +74,12 @@ class Capybara::Selenium::Node < Capybara::Driver::Node
   end
 
   def select_option
-    native.click unless selected? || disabled?
+    click unless selected? || disabled?
   end
 
   def unselect_option
     raise Capybara::UnselectNotAllowed, 'Cannot unselect option from single select box.' unless select_node.multiple?
-    native.click if selected?
+    click if selected?
   end
 
   def click(keys = [], **options)
@@ -210,15 +210,13 @@ private
       # Clear field by sending the correct number of backspace keys.
       backspaces = [:backspace] * self.value.to_s.length
       send_keys(*([:end] + backspaces + [value]))
-    elsif clear == :none
-      send_keys(value)
     elsif clear.is_a? Array
       send_keys(*clear, value)
     else
       # Clear field by JavaScript assignment of the value property.
       # Script can change a readonly element which user input cannot, so
       # don't execute if readonly.
-      driver.execute_script "arguments[0].value = ''", self
+      driver.execute_script "arguments[0].value = ''", self unless clear == :none
       send_keys(value)
     end
   end