diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb index d3420a6a3ced66fd53a1610cde81997a3a57a42e..6677850a11ec6a9b86b2917a41d3f8706a492f16 100644 --- a/railties/lib/rails/generators/app_base.rb +++ b/railties/lib/rails/generators/app_base.rb @@ -248,7 +248,7 @@ def bundle_command(command) end def run_bundle - bundle_command('install') unless options[:skip_gemfile] || options[:skip_bundle] + bundle_command('install') unless options[:skip_gemfile] || options[:skip_bundle] || options[:pretend] end def empty_directory_with_gitkeep(destination, config = {}) diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb index e2c98274b1381d529700f22aa8c4ca8526af3b3c..a3c24c392bcab8edadb588da302f69e9adccbb17 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -355,6 +355,11 @@ def test_active_record_dependent_restrict_raises_is_present_application_config assert_file "config/application.rb", /config\.active_record\.dependent_restrict_raises = false/ end + def test_pretend_option + output = run_generator [File.join(destination_root, "myapp"), "--pretend"] + assert_no_match(/run bundle install/, output) + end + protected def action(*args, &block)