Merged r22011 from trunk to 5.0-stable (#38135).

git-svn-id: https://svn.redmine.org/redmine/branches/5.0-stable@22017 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/Gemfile b/Gemfile
index 88158dcda2b25c0b5ac52b481fd758340f279ce5..739de9aaef843f7cc9e18b94c9d6055d35dd375b 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -97,9 +97,14 @@ group :test do
   gem 'simplecov', '~> 0.21.2', :require => false
   gem "ffi", platforms: [:mingw, :x64_mingw, :mswin]
   # For running system tests
-  # TODO: Remove version specification once Capybara supports Puma 6
-  gem 'puma', '< 6.0.0'
-  gem 'capybara', (Gem.ruby_version < Gem::Version.new('2.6.0') ? '~> 3.35.3' : '~> 3.36.0')
+  gem 'puma', (Gem.ruby_version < Gem::Version.new('2.7') ? '< 6.0.0' : '>= 0')
+  gem 'capybara', (if Gem.ruby_version < Gem::Version.new('2.6')
+                     '~> 3.35.3'
+                   elsif Gem.ruby_version < Gem::Version.new('2.7')
+                     '~> 3.36.0'
+                   else
+                     '~> 3.38.0'
+                   end)
   gem "selenium-webdriver", "~> 3.142.7"
   gem 'webdrivers', '4.6.1', require: false
   # RuboCop