From 082381f28f0a8e65821ca84b36d8ff1d52db0d83 Mon Sep 17 00:00:00 2001 From: Martin Meyerhoff Date: Tue, 16 Jan 2024 09:37:23 +0100 Subject: [PATCH 1/2] Allow Puma 6 Puma 6 was disallowed in 2022, because back then Rails itself generated Gemfiles with `'puma', "< 6". This is not the case anymore, in fact, Rails comes with Rack 3 which instead is incompatible with Puma 5. --- solidus_dev_support.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/solidus_dev_support.gemspec b/solidus_dev_support.gemspec index 1528539a..9652bd63 100644 --- a/solidus_dev_support.gemspec +++ b/solidus_dev_support.gemspec @@ -38,7 +38,7 @@ Gem::Specification.new do |spec| spec.add_dependency 'ffaker', '~> 2.13' spec.add_dependency 'gem-release', '~> 2.1' spec.add_dependency 'github_changelog_generator', '~> 1.15' - spec.add_dependency 'puma', '>= 4.3', '< 6.0' + spec.add_dependency 'puma', '>= 4.3', '< 7.0' spec.add_dependency 'rspec_junit_formatter' spec.add_dependency 'rspec-rails', '>= 4.0.0.beta3', '< 6.0' spec.add_dependency 'rubocop', '~> 1.0' From 4bd5c587d7b23fca9d9a3c3fa50b54d5c1048a80 Mon Sep 17 00:00:00 2001 From: Martin Meyerhoff Date: Tue, 16 Jan 2024 11:34:59 +0100 Subject: [PATCH 2/2] Rubocop fix --- spec/features/create_extension_spec.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spec/features/create_extension_spec.rb b/spec/features/create_extension_spec.rb index d709d07a..869c1eba 100644 --- a/spec/features/create_extension_spec.rb +++ b/spec/features/create_extension_spec.rb @@ -173,11 +173,11 @@ def sh(*args) output.to_s end - def with_unbundled_env(&block) + def with_unbundled_env(...) if Bundler.respond_to?(:with_unbundled_env) - Bundler.with_unbundled_env(&block) + Bundler.with_unbundled_env(...) else - Bundler.with_clean_env(&block) + Bundler.with_clean_env(...) end end