Merge pull request #216 from mamhoff/allow-puma-6

Allow Puma 6
solidusio · Jan 16, 2024 · b1b9aab · b1b9aab
2 parents b1d211f + 4bd5c58
commit b1b9aab
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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'

diff --git 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