kotovalexarian-likes-github
/
teamcapybara--capybara
mirror of https://github.com/teamcapybara/capybara.git
1
0
Fork 0
Code Releases Activity

Driver#execute_script/evaluate_script methods are required to accept arguments parameter in v3

This commit is contained in:
Thomas Walpole 2018-01-10 16:31:59 -08:00
parent 83f58d1b0d
commit fe4af9ecc4
1 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/capybara/session.rb
View File

@ -582,12 +582,7 @@ module Capybara
#
def execute_script(script, *args)
@touched = true
if args.empty?
driver.execute_script(script)
else
raise Capybara::NotSupportedByDriverError, "The current driver does not support execute_script arguments" if driver.method(:execute_script).arity == 1
driver.execute_script(script, *args.map { |arg| arg.is_a?(Capybara::Node::Element) ? arg.base : arg })
end
driver.execute_script(script, *args.map { |arg| arg.is_a?(Capybara::Node::Element) ? arg.base : arg })
end
##
@ -601,12 +596,7 @@ module Capybara
#
def evaluate_script(script, *args)
@touched = true
result = if args.empty?
driver.evaluate_script(script)
else
raise Capybara::NotSupportedByDriverError, "The current driver does not support evaluate_script arguments" if driver.method(:evaluate_script).arity == 1
driver.evaluate_script(script, *args.map { |arg| arg.is_a?(Capybara::Node::Element) ? arg.base : arg })
end
result = driver.evaluate_script(script, *args.map { |arg| arg.is_a?(Capybara::Node::Element) ? arg.base : arg })
element_script_result(result)
end
@ -619,12 +609,7 @@ module Capybara
#
def evaluate_async_script(script, *args)
@touched = true
result = if args.empty?
driver.evaluate_async_script(script)
else
raise Capybara::NotSupportedByDriverError, "The current driver does not support evaluate_async_script arguments" if driver.method(:evaluate_async_script).arity == 1
driver.evaluate_async_script(script, *args.map { |arg| arg.is_a?(Capybara::Node::Element) ? arg.base : arg })
end
result = driver.evaluate_async_script(script, *args.map { |arg| arg.is_a?(Capybara::Node::Element) ? arg.base : arg })
element_script_result(result)
end