Driver#execute_script/evaluate_script methods are required to accept arguments parameter in v3
This commit is contained in:
parent
83f58d1b0d
commit
fe4af9ecc4
|
@ -582,12 +582,7 @@ module Capybara
|
||||||
#
|
#
|
||||||
def execute_script(script, *args)
|
def execute_script(script, *args)
|
||||||
@touched = true
|
@touched = true
|
||||||
if args.empty?
|
driver.execute_script(script, *args.map { |arg| arg.is_a?(Capybara::Node::Element) ? arg.base : arg })
|
||||||
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
|
|
||||||
end
|
end
|
||||||
|
|
||||||
##
|
##
|
||||||
|
@ -601,12 +596,7 @@ module Capybara
|
||||||
#
|
#
|
||||||
def evaluate_script(script, *args)
|
def evaluate_script(script, *args)
|
||||||
@touched = true
|
@touched = true
|
||||||
result = if args.empty?
|
result = driver.evaluate_script(script, *args.map { |arg| arg.is_a?(Capybara::Node::Element) ? arg.base : arg })
|
||||||
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
|
|
||||||
element_script_result(result)
|
element_script_result(result)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -619,12 +609,7 @@ module Capybara
|
||||||
#
|
#
|
||||||
def evaluate_async_script(script, *args)
|
def evaluate_async_script(script, *args)
|
||||||
@touched = true
|
@touched = true
|
||||||
result = if args.empty?
|
result = driver.evaluate_async_script(script, *args.map { |arg| arg.is_a?(Capybara::Node::Element) ? arg.base : arg })
|
||||||
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
|
|
||||||
element_script_result(result)
|
element_script_result(result)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue