Permalink
Browse files

Revert "Install binstubs by default"

This reverts commit f34c27a.

We'll be taking a different tack on this with new `bundle binstubs <gem>` support.
  • Loading branch information...
jeremy committed Dec 28, 2012
1 parent a79300a commit 1e9d6e7b567c778baa884e7e569e67cdf5040119
Showing with 4 additions and 4 deletions.
  1. +1 −1 railties/lib/rails/generators/app_base.rb
  2. +3 −3 railties/test/generators/shared_generator_tests.rb
@@ -261,7 +261,7 @@ def bundle_command(command)
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 = {})
@@ -27,7 +27,7 @@ def test_skeleton_is_created
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 @@ def test_template_is_executed_when_supplied_an_https_path
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

0 comments on commit 1e9d6e7

Please sign in to comment.