Skip to content

[close #23681] Use puma 3.0.0+ #23906

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
schneems merged 1 commit into from
Feb 26, 2016
Merged

[close #23681] Use puma 3.0.0+ #23906

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion railties/lib/rails/generators/app_base.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ def database_gemfile_entry
def webserver_gemfile_entry
return [] if options[:skip_puma]
comment = 'Use Puma as the app server'
GemfileEntry.new('puma', nil, comment)
GemfileEntry.new('puma', '~> 3.0', comment)
end

def include_all_railties?
Expand Down
5 changes: 5 additions & 0 deletions railties/test/generators/app_generator_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,6 +366,11 @@ def test_generator_without_skips
end
end

def test_generator_defaults_to_puma_version
run_generator [destination_root]
assert_gem "puma", "'~> 3.0'"
end

def test_generator_if_skip_puma_is_given
run_generator [destination_root, "--skip-puma"]
assert_no_file "config/puma.rb"
Expand Down