Allow use of Puma 6.0.0 or later (#38135).

Capybara >= 3.39.0 supports Puma 6.0.

git-svn-id: https://svn.redmine.org/redmine/trunk@22011 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/Gemfile b/Gemfile
index 02c12a18693a1ada283f1813d31ec48d7edd18f9..372e57d6517ad23aa35a103db14357485e968216 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -98,9 +98,8 @@ group :test do
   gem 'simplecov', '~> 0.22.0', :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', '~> 3.36.0'
+  gem 'puma', (Gem.ruby_version < Gem::Version.new('2.7') ? '< 6.0.0' : '>= 0')
+  gem 'capybara', (Gem.ruby_version < Gem::Version.new('2.7') ? '~> 3.36.0' : '~> 3.38.0')
   gem "selenium-webdriver", "~> 3.142.7"
   gem 'webdrivers', '4.6.1', require: false
   # RuboCop