From: Go MAEDA <maeda@farend.jp>
Date: Mon, 2 Jan 2023 05:38:02 +0000 (+0000)
Subject: Merged r22011 from trunk to 5.0-stable (#38135).
X-Git-Tag: 5.0.5~19
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=50f84c20b8235cd065fc30461e7b6957113def3c;p=redmine.git

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 88158dcda..739de9aae 100644
--- 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