Merge pull request #30770 from y-yagi/do_not_create_credential_in_dummy_application

Do not create credentials in dummy application
This commit is contained in:
Kasper Timm Hansen 2017-11-12 14:41:42 +01:00 committed by GitHub
commit 99f4d6e744
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 2 deletions

@ -159,7 +159,7 @@ def config_when_updating
end
def master_key
return if options[:pretend]
return if options[:pretend] || options[:dummy_app]
require "rails/generators/rails/master_key/master_key_generator"
@ -169,7 +169,7 @@ def master_key
end
def credentials
return if options[:pretend]
return if options[:pretend] || options[:dummy_app]
require "rails/generators/rails/credentials/credentials_generator"

@ -98,6 +98,7 @@ def generate_test_dummy(force = false)
opts[:skip_listen] = true
opts[:skip_git] = true
opts[:skip_turbolinks] = true
opts[:dummy_app] = true
invoke Rails::Generators::AppGenerator,
[ File.expand_path(dummy_path, destination_root) ], opts

@ -474,6 +474,8 @@ def test_unnecessary_files_are_not_generated_in_dummy_application
assert_no_file "test/dummy/Gemfile"
assert_no_file "test/dummy/public/robots.txt"
assert_no_file "test/dummy/README.md"
assert_no_file "test/dummy/config/master.key"
assert_no_file "test/dummy/config/credentials.yml.enc"
assert_no_directory "test/dummy/lib/tasks"
assert_no_directory "test/dummy/test"
assert_no_directory "test/dummy/vendor"