Permalink
Browse files

Revert changes related to `bundle install` fixes in `rails new`

Reverted changes:
  f3482a9 Fix tests in railties
  5904295 improve #6318
  aed906a prevent using already loaded Gemfile for 'bundle install'

In order to fix this, we need a fix in bundler related to GEM_PATH,
which will allow to run tests properly. I will get this changes back
when it happens.
  • Loading branch information...
1 parent 319903b commit 0f5cc34ab58cda99d1401ecc82e1ebb873838dd7 @drogus drogus committed May 17, 2012
Showing with 3 additions and 17 deletions.
  1. +1 −10 railties/lib/rails/generators/app_base.rb
  2. +2 −7 railties/test/generators/plugin_new_generator_test.rb
@@ -246,17 +246,8 @@ def bundle_command(command)
# is easier to silence stdout in the existing test suite this way. The
# end-user gets the bundler commands called anyway, so no big deal.
#
- # We unset temporary bundler variables to load proper bundler and Gemfile.
- #
# Thanks to James Tucker for the Gem tricks involved in this call.
- _bundle_command = Gem.bin_path('bundler', 'bundle')
-
- bundle_bin_path, bundle_gemfile, rubyopt = ENV['BUNDLE_BIN_PATH'], ENV['BUNDLE_GEMFILE'], ENV['RUBYOPT']
- ENV['BUNDLE_BIN_PATH'], ENV['BUNDLE_GEMFILE'], ENV['RUBYOPT'] = "", "", ""
-
- print `"#{Gem.ruby}" "#{_bundle_command}" #{command}`
-
- ENV['BUNDLE_BIN_PATH'], ENV['BUNDLE_GEMFILE'], ENV['RUBYOPT'] = bundle_bin_path, bundle_gemfile, rubyopt
+ print `"#{Gem.ruby}" "#{Gem.bin_path('bundler', 'bundle')}" #{command}`
end
def run_bundle
@@ -99,13 +99,7 @@ def test_ensure_that_database_option_is_passed_to_app_generator
end
def test_generation_runs_bundle_install_with_full_and_mountable
- result = run_generator [destination_root, "--mountable", "--full", "--dev"]
- assert_file "#{destination_root}/Gemfile.lock" do |contents|
- assert_match(/bukkits/, contents)
- end
- assert_match(/run bundle install/, result)
- assert_match(/Using bukkits \(0\.0\.1\)/, result)
- assert_match(/Your bundle is complete/, result)
+ result = run_generator [destination_root, "--mountable", "--full"]
assert_equal 1, result.scan("Your bundle is complete").size
end
@@ -354,3 +348,4 @@ def action(*args, &block)
silence(:stdout){ generator.send(*args, &block) }
end
end
+

0 comments on commit 0f5cc34

Please sign in to comment.