Don't run bundle install when passed with --pretend option

kennyj · Jan 31, 2012 · 0c0e58c · 0c0e58c
1 parent 40b2189
commit 0c0e58c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git 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
@@ -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)