From 344b79b743e6d441cb1c332471b8802c9a5d4437 Mon Sep 17 00:00:00 2001 From: Jon Rowe Date: Fri, 14 Oct 2022 09:05:26 +0100 Subject: [PATCH] Pin puma --- Gemfile-rails-dependencies | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Gemfile-rails-dependencies b/Gemfile-rails-dependencies index 7308a48c5..c69e62e05 100644 --- a/Gemfile-rails-dependencies +++ b/Gemfile-rails-dependencies @@ -14,15 +14,16 @@ 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| @@ -30,14 +31,12 @@ when /stable$/ 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