From 9b834e7445ce5d1676a52305462dd4a128857f81 Mon Sep 17 00:00:00 2001 From: Thomas Walpole Date: Fri, 20 Jul 2018 00:07:30 -0700 Subject: [PATCH] Strip script in Session rather than Selenium driver --- History.md | 7 +++++++ lib/capybara/selenium/driver.rb | 2 +- lib/capybara/session.rb | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/History.md b/History.md index cb82f1b1..6aa67dde 100644 --- a/History.md +++ b/History.md @@ -1,3 +1,10 @@ +# Version 3.4.1 +Release date: unreleased + +### Fixed + +* `Session#evaluate_script` now strips the script in `Session` rather than only in the Selenium driver + # Version 3.4.0 Release date: 2018-07-19 diff --git a/lib/capybara/selenium/driver.rb b/lib/capybara/selenium/driver.rb index 6ccc2fa3..0f33a389 100644 --- a/lib/capybara/selenium/driver.rb +++ b/lib/capybara/selenium/driver.rb @@ -99,7 +99,7 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base end def evaluate_script(script, *args) - result = execute_script("return #{script.strip}", *args) + result = execute_script("return #{script}", *args) unwrap_script_result(result) end diff --git a/lib/capybara/session.rb b/lib/capybara/session.rb index 08b746fe..db57d15b 100644 --- a/lib/capybara/session.rb +++ b/lib/capybara/session.rb @@ -580,7 +580,7 @@ module Capybara # def evaluate_script(script, *args) @touched = true - result = driver.evaluate_script(script, *driver_args(args)) + result = driver.evaluate_script(script.strip, *driver_args(args)) element_script_result(result) end