diff options
| author | Piotr Sarnacki <drogus@gmail.com> | 2012-05-17 10:19:04 -0700 |
|---|---|---|
| committer | Piotr Sarnacki <drogus@gmail.com> | 2012-05-17 11:33:40 -0700 |
| commit | 0f5cc34ab58cda99d1401ecc82e1ebb873838dd7 (patch) | |
| tree | 43f51fb2b09a3e3ecec6865068786791186edfaa /railties/test | |
| parent | 319903bde56bae0f7c83a049bb44377522699bd8 (diff) | |
| download | rails-0f5cc34ab58cda99d1401ecc82e1ebb873838dd7.tar.gz rails-0f5cc34ab58cda99d1401ecc82e1ebb873838dd7.tar.bz2 rails-0f5cc34ab58cda99d1401ecc82e1ebb873838dd7.zip | |
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.
Diffstat (limited to 'railties/test')
| -rw-r--r-- | railties/test/generators/plugin_new_generator_test.rb | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/railties/test/generators/plugin_new_generator_test.rb b/railties/test/generators/plugin_new_generator_test.rb index b0e1865b26..51374e5f3f 100644 --- a/railties/test/generators/plugin_new_generator_test.rb +++ b/railties/test/generators/plugin_new_generator_test.rb @@ -99,13 +99,7 @@ class PluginNewGeneratorTest < Rails::Generators::TestCase 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 @@ protected silence(:stdout){ generator.send(*args, &block) } end end + |