Browse files

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

  • Loading branch information...
1 parent 40b2189 commit 0c0e58c913c041c3031342e78cbf7117eb1b971c @kennyj kennyj committed Jan 31, 2012
Showing with 6 additions and 1 deletion.
  1. +1 −1 railties/lib/rails/generators/app_base.rb
  2. +5 −0 railties/test/generators/app_generator_test.rb
View
2 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 = {})
View
5 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)

0 comments on commit 0c0e58c

Please sign in to comment.