aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test
diff options
context:
space:
mode:
authorRichard Schneeman <richard.schneeman@gmail.com>2016-02-26 08:54:05 -0600
committerRichard Schneeman <richard.schneeman@gmail.com>2016-02-26 08:54:05 -0600
commit364e155f97f3144c06e10f045b7182ed6ee071a1 (patch)
treee3518871362c2408a79bc377d8a09e2b95ed5666 /railties/test
parent56ca2061df83a307943a0ffdfe6f5f4ed5846cf7 (diff)
parent8374b2fc852050cd26ddd91cf82e3d819a2b63ef (diff)
downloadrails-364e155f97f3144c06e10f045b7182ed6ee071a1.tar.gz
rails-364e155f97f3144c06e10f045b7182ed6ee071a1.tar.bz2
rails-364e155f97f3144c06e10f045b7182ed6ee071a1.zip
Merge pull request #23906 from schneems/schneems/puma-3-0
[close #23681] Use puma 3.0.0+
Diffstat (limited to 'railties/test')
-rw-r--r--railties/test/generators/app_generator_test.rb5
1 files changed, 5 insertions, 0 deletions
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index ec8ec4787f..c5f9e11ad3 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -366,6 +366,11 @@ class AppGeneratorTest < Rails::Generators::TestCase
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"