diff options
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 6 | ||||
| -rw-r--r-- | actionpack/lib/action_dispatch/system_testing/browser.rb | 6 | ||||
| -rw-r--r-- | actionpack/test/dispatch/system_testing/screenshot_helper_test.rb | 1 | ||||
| -rw-r--r-- | actionpack/test/dispatch/system_testing/system_test_case_test.rb | 1 | ||||
| -rw-r--r-- | activesupport/CHANGELOG.md | 1 |
6 files changed, 9 insertions, 8 deletions
@@ -10,7 +10,7 @@ gemspec gem "rake", ">= 11.1" gem "capybara", ">= 2.15" -gem "selenium-webdriver", "~> 3.5.1" +gem "selenium-webdriver", ">= 3.5.0", "< 3.13.0" gem "rack-cache", "~> 1.2" gem "sass-rails" diff --git a/Gemfile.lock b/Gemfile.lock index 3329e47566..996e9d5942 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -433,9 +433,9 @@ GEM tilt (>= 1.1, < 3) sdoc (1.0.0) rdoc (>= 5.0) - selenium-webdriver (3.5.2) + selenium-webdriver (3.12.0) childprocess (~> 0.5) - rubyzip (~> 1.0) + rubyzip (~> 1.2) sequel (5.14.0) serverengine (2.0.7) sigdump (~> 0.2.2) @@ -572,7 +572,7 @@ DEPENDENCIES rubocop (>= 0.47) sass-rails sdoc (~> 1.0) - selenium-webdriver (~> 3.5.1) + selenium-webdriver (>= 3.5.0, < 3.13.0) sequel sidekiq sneakers diff --git a/actionpack/lib/action_dispatch/system_testing/browser.rb b/actionpack/lib/action_dispatch/system_testing/browser.rb index 2ffb5f67f6..c34907b6cb 100644 --- a/actionpack/lib/action_dispatch/system_testing/browser.rb +++ b/actionpack/lib/action_dispatch/system_testing/browser.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require "selenium/webdriver" - module ActionDispatch module SystemTesting class Browser # :nodoc: @@ -35,9 +33,9 @@ module ActionDispatch @option ||= case type when :chrome - Selenium::WebDriver::Chrome::Options.new + ::Selenium::WebDriver::Chrome::Options.new when :firefox - Selenium::WebDriver::Firefox::Options.new + ::Selenium::WebDriver::Firefox::Options.new end end diff --git a/actionpack/test/dispatch/system_testing/screenshot_helper_test.rb b/actionpack/test/dispatch/system_testing/screenshot_helper_test.rb index 097ef8af29..b756b91379 100644 --- a/actionpack/test/dispatch/system_testing/screenshot_helper_test.rb +++ b/actionpack/test/dispatch/system_testing/screenshot_helper_test.rb @@ -3,6 +3,7 @@ require "abstract_unit" require "action_dispatch/system_testing/test_helpers/screenshot_helper" require "capybara/dsl" +require "selenium/webdriver" class ScreenshotHelperTest < ActiveSupport::TestCase test "image path is saved in tmp directory" do diff --git a/actionpack/test/dispatch/system_testing/system_test_case_test.rb b/actionpack/test/dispatch/system_testing/system_test_case_test.rb index b078a5abc5..847b09dcfe 100644 --- a/actionpack/test/dispatch/system_testing/system_test_case_test.rb +++ b/actionpack/test/dispatch/system_testing/system_test_case_test.rb @@ -1,6 +1,7 @@ # frozen_string_literal: true require "abstract_unit" +require "selenium/webdriver" class SetDriverToRackTestTest < DrivenByRackTest test "uses rack_test" do diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md index cd96f4b750..684ecddb18 100644 --- a/activesupport/CHANGELOG.md +++ b/activesupport/CHANGELOG.md @@ -4,6 +4,7 @@ *Stefan Schüßler* + ## Rails 6.0.0.beta1 (January 18, 2019) ## * Remove deprecated `Module#reachable?` method. |