aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test
diff options
context:
space:
mode:
authorRichard Schneeman <richard.schneeman@gmail.com>2016-02-01 10:52:44 -0600
committerRichard Schneeman <richard.schneeman@gmail.com>2016-02-01 10:52:44 -0600
commit25a42755403ba4a8d9a4128d5ff6483ca2fd9252 (patch)
treea3f0e72e8edc29be93e2ff01dbe14ec75e73cf9f /railties/test
parent9c9202b8f5f0bee8cb55c1092a4ac8e7747e5bb0 (diff)
parent5563c329eee5febc22a3330e16fe8a6899d42fe2 (diff)
downloadrails-25a42755403ba4a8d9a4128d5ff6483ca2fd9252.tar.gz
rails-25a42755403ba4a8d9a4128d5ff6483ca2fd9252.tar.bz2
rails-25a42755403ba4a8d9a4128d5ff6483ca2fd9252.zip
Merge pull request #23057 from schneems/schneems/default-puma-config
Add Default Puma Config
Diffstat (limited to 'railties/test')
-rw-r--r--railties/test/generators/app_generator_test.rb9
1 files changed, 9 insertions, 0 deletions
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index 49536c068f..937f68fff8 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -27,6 +27,7 @@ DEFAULT_APP_FILES = %w(
config/initializers
config/locales
config/cable.yml
+ config/puma.rb
db
lib
lib/tasks
@@ -337,6 +338,14 @@ class AppGeneratorTest < Rails::Generators::TestCase
end
end
+ def test_generator_if_skip_puma_is_given
+ run_generator [destination_root, "--skip-puma"]
+ assert_no_file "config/puma.rb"
+ assert_file "Gemfile" do |content|
+ assert_no_match(/puma/, content)
+ end
+ end
+
def test_generator_if_skip_active_record_is_given
run_generator [destination_root, "--skip-active-record"]
assert_no_file "config/database.yml"