Merge pull request #2626 from rspec/fix-build

Pin puma to less than 6 to avoid issue with capybara

Author: JonRowe

Gemfile-rails-dependencies

@@ -14,30 +14,29 @@ end
 # sqlite3 is an optional, unspecified, dependency and Rails 6.0 only supports `~> 1.4`
 gem 'sqlite3', '~> 1.4', platforms: [:ruby]
 
+# Due to capybara strings issue
+gem 'puma', '< 6.0.0'
+
 case version = ENV['RAILS_VERSION'] || (File.exist?(version_file) && File.read(version_file).chomp) || ''
 when /main/
   gem "rails", :git => "https://github.com/rails/rails.git"
-  gem 'puma', "3.12.1"
   gem 'activerecord-jdbcsqlite3-adapter', git: 'https://github.com/jruby/activerecord-jdbc-adapter', platforms: [:jruby]
   gem 'selenium-webdriver', require: false
 when /stable$/
   gem_list = %w[rails railties actionmailer actionpack activerecord activesupport activejob actionview]
-  gem 'puma', "3.12.1"
   gem 'activerecord-jdbcsqlite3-adapter', git: 'https://github.com/jruby/activerecord-jdbc-adapter', platforms: [:jruby]
 
   gem_list.each do |rails_gem|
     gem rails_gem, :git => "https://github.com/rails/rails.git", :branch => version
   end
 when nil, false, ""
   gem "rails", "~> 7.0.0"
-  gem "puma"
   gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby]
   gem 'selenium-webdriver', require: false
 else
   add_net_gems_dependency if version.split(' ').last < '7.0'
 
   gem "rails", version
-  gem "puma"
   gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby]
   gem 'selenium-webdriver', require: false
 end