From 425f100f0854ce64a83370a076d97dfae7daf1b1 Mon Sep 17 00:00:00 2001 From: Sean Doyle Date: Wed, 2 Aug 2023 09:56:08 -0400 Subject: [PATCH] Add RUBY_VERSION conditional --- Gemfile | 7 ++++++- .../lib/rails/generators/rails/app/templates/Gemfile.tt | 7 +++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 4add0d314a..b24c5e2edf 100644 --- a/Gemfile +++ b/Gemfile @@ -15,7 +15,12 @@ gem "rake", ">= 13" gem "sprockets-rails", ">= 2.0.0" gem "propshaft", ">= 0.1.7" gem "capybara", ">= 3.39" -gem "selenium-webdriver", ">= 4.11.0" +if RUBY_VERSION < "3" + gem "selenium-webdriver", "<= 4.9.0" + gem "webdrivers" +else + gem "selenium-webdriver", ">= 4.11.0" +end gem "rack-cache", "~> 1.2" gem "stimulus-rails" diff --git a/railties/lib/rails/generators/rails/app/templates/Gemfile.tt b/railties/lib/rails/generators/rails/app/templates/Gemfile.tt index aadcbbb0ce..2c9852a699 100644 --- a/railties/lib/rails/generators/rails/app/templates/Gemfile.tt +++ b/railties/lib/rails/generators/rails/app/templates/Gemfile.tt @@ -59,7 +59,10 @@ end <%- if depends_on_system_test? -%> group :test do # Use system testing [https://guides.rubyonrails.org/testing.html#system-testing] - gem "capybara", ">= 3.39" - gem "selenium-webdriver", ">= 4.11.0" + gem "capybara" + gem "selenium-webdriver" +<%- if RUBY_VERSION < "3.0" -%> + gem "webdrivers" +<% end %> end <%- end -%>