kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Revert "Install binstubs by default"

Browse source 
This reverts commit f34c27a452.

We'll be taking a different tack on this with new `bundle binstubs <gem>` support.
This commit is contained in:
Jeremy Kemper 2012-12-28 14:23:01 -07:00
parent a79300a0d8
commit 1e9d6e7b56
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
railties/lib/rails/generators/app_base.rb
View file

@ -261,7 +261,7 @@ module Rails
end
def run_bundle
bundle_command('install --binstubs') unless options[:skip_gemfile] || options[:skip_bundle] || options[:pretend]
bundle_command('install') unless options[:skip_gemfile] || options[:skip_bundle] || options[:pretend]
end
def empty_directory_with_keep_file(destination, config = {})

6
railties/test/generators/shared_generator_tests.rb
View file

@ -27,7 +27,7 @@ module SharedGeneratorTests
end
def test_generation_runs_bundle_install
generator([destination_root]).expects(:bundle_command).with('install --binstubs').once
generator([destination_root]).expects(:bundle_command).with('install').once
quietly { generator.invoke_all }
end
@ -101,14 +101,14 @@ module SharedGeneratorTests
end
def test_dev_option
generator([destination_root], dev: true).expects(:bundle_command).with('install --binstubs').once
generator([destination_root], dev: true).expects(:bundle_command).with('install').once
quietly { generator.invoke_all }
rails_path = File.expand_path('../../..', Rails.root)
assert_file 'Gemfile', /^gem\s+["']rails["'],\s+path:\s+["']#{Regexp.escape(rails_path)}["']$/
end
def test_edge_option
generator([destination_root], edge: true).expects(:bundle_command).with('install --binstubs').once
generator([destination_root], edge: true).expects(:bundle_command).with('install').once
quietly { generator.invoke_all }
assert_file 'Gemfile', %r{^gem\s+["']rails["'],\s+github:\s+["']#{Regexp.escape("rails/rails")}["']$}
end