move arg conversion into own method

This commit is contained in:
Thomas Walpole 2018-05-11 09:42:15 -07:00
parent 2dc9774da2
commit 3de215400e
1 changed files with 6 additions and 2 deletions

View File

@ -101,7 +101,7 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
def needs_server?; true; end
def execute_script(script, *args)
browser.execute_script(script, *args.map { |arg| arg.is_a?(Capybara::Selenium::Node) ? arg.native : arg })
browser.execute_script(script, *native_args(args))
end
def evaluate_script(script, *args)
@ -111,7 +111,7 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
def evaluate_async_script(script, *args)
browser.manage.timeouts.script_timeout = Capybara.default_max_wait_time
result = browser.execute_async_script(script, *args.map { |arg| arg.is_a?(Capybara::Selenium::Node) ? arg.native : arg })
result = browser.execute_async_script(script, *native_args(args))
unwrap_script_result(result)
end
@ -327,6 +327,10 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
private
def native_args(args)
args.map { |arg| arg.is_a?(Capybara::Selenium::Node) ? arg.native : arg }
end
def clear_storage
if options[:clear_session_storage]
if @browser.respond_to? :session_storage