aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/generators
diff options
context:
space:
mode:
authoryuuji.yaginuma <yuuji.yaginuma@gmail.com>2017-10-02 08:03:24 +0900
committeryuuji.yaginuma <yuuji.yaginuma@gmail.com>2017-10-02 08:03:24 +0900
commitd1eb0ef88bfded6d797203e09c71d74bd651e09b (patch)
treefcef0236fdf8f1c59883442e399433aa798b10e4 /railties/lib/rails/generators
parent1a2a63f1e07253a2e07c09b82cddd00f661523b2 (diff)
downloadrails-d1eb0ef88bfded6d797203e09c71d74bd651e09b.tar.gz
rails-d1eb0ef88bfded6d797203e09c71d74bd651e09b.tar.bz2
rails-d1eb0ef88bfded6d797203e09c71d74bd651e09b.zip
Do not create credentials in dummy application
Because dummy application is only for use test, so credentials is unnecessary.
Diffstat (limited to 'railties/lib/rails/generators')
-rw-r--r--railties/lib/rails/generators/rails/app/app_generator.rb4
-rw-r--r--railties/lib/rails/generators/rails/plugin/plugin_generator.rb1
2 files changed, 3 insertions, 2 deletions
diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb
index 23fdf03b05..409d0f816c 100644
--- a/railties/lib/rails/generators/rails/app/app_generator.rb
+++ b/railties/lib/rails/generators/rails/app/app_generator.rb
@@ -159,7 +159,7 @@ module Rails
end
def master_key
- return if options[:pretend]
+ return if options[:pretend] || options[:dummy_app]
require_relative "../master_key/master_key_generator"
@@ -169,7 +169,7 @@ module Rails
end
def credentials
- return if options[:pretend]
+ return if options[:pretend] || options[:dummy_app]
require_relative "../credentials/credentials_generator"
diff --git a/railties/lib/rails/generators/rails/plugin/plugin_generator.rb b/railties/lib/rails/generators/rails/plugin/plugin_generator.rb
index eb941adf95..6b40fbb602 100644
--- a/railties/lib/rails/generators/rails/plugin/plugin_generator.rb
+++ b/railties/lib/rails/generators/rails/plugin/plugin_generator.rb
@@ -99,6 +99,7 @@ task default: :test
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