Skip to content

Commit 364e155

Browse files
committed
Merge pull request rails#23906 from schneems/schneems/puma-3-0
[close rails#23681] Use puma 3.0.0+
2 parents 56ca206 + 8374b2f commit 364e155

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

railties/lib/rails/generators/app_base.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ def database_gemfile_entry
181181
def webserver_gemfile_entry
182182
return [] if options[:skip_puma]
183183
comment = 'Use Puma as the app server'
184-
GemfileEntry.new('puma', nil, comment)
184+
GemfileEntry.new('puma', '~> 3.0', comment)
185185
end
186186

187187
def include_all_railties?

railties/test/generators/app_generator_test.rb

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -366,6 +366,11 @@ def test_generator_without_skips
366366
end
367367
end
368368

369+
def test_generator_defaults_to_puma_version
370+
run_generator [destination_root]
371+
assert_gem "puma", "'~> 3.0'"
372+
end
373+
369374
def test_generator_if_skip_puma_is_given
370375
run_generator [destination_root, "--skip-puma"]
371376
assert_no_file "config/puma.rb"

0 commit comments

Comments
 (0)