diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2010-02-04 09:28:41 -0800 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2010-02-04 10:08:06 -0800 |
| commit | 5c07c33ab4de037aeb1f6cc6817fddd28f9a35d2 (patch) | |
| tree | c8ce4be48b23fc0ef09ed63c9e3c2a5befcc929a /railties/test | |
| parent | 6b3fb384615003ae6cf74e8acfdb8bea9c0f683d (diff) | |
| download | rails-5c07c33ab4de037aeb1f6cc6817fddd28f9a35d2.tar.gz rails-5c07c33ab4de037aeb1f6cc6817fddd28f9a35d2.tar.bz2 rails-5c07c33ab4de037aeb1f6cc6817fddd28f9a35d2.zip | |
Move framework requires and Bundler.require from boot.rb to app.rb. Cut down the list of railtie choices to those that make sense.
Diffstat (limited to 'railties/test')
| -rw-r--r-- | railties/test/generators/app_generator_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb index 76579adb26..9c70dcbc92 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -90,7 +90,7 @@ class AppGeneratorTest < Rails::Generators::TestCase def test_activerecord_is_removed_from_frameworks_if_skip_activerecord_is_given run_generator [destination_root, "--skip-activerecord"] - assert_file "config/boot.rb", /# require "active_record\/railtie"/ + assert_file "config/application.rb", /# require "active_record\/railtie"/ end def test_prototype_and_test_unit_are_added_by_default |