diff options
| author | José Valim <jose.valim@gmail.com> | 2009-06-25 10:44:46 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2009-06-25 10:44:46 +0200 |
| commit | eaef1ee09c4bd2ed11722660fddf9b4e7e1384cc (patch) | |
| tree | 18fefccf66400752301f80b0394089da24682e3a /railties/test/boot_test.rb | |
| parent | 5337766fa02142c72312ae2d39620e377f6c7155 (diff) | |
| download | rails-eaef1ee09c4bd2ed11722660fddf9b4e7e1384cc.tar.gz rails-eaef1ee09c4bd2ed11722660fddf9b4e7e1384cc.tar.bz2 rails-eaef1ee09c4bd2ed11722660fddf9b4e7e1384cc.zip | |
Make tests pass again after merge.
Diffstat (limited to 'railties/test/boot_test.rb')
| -rw-r--r-- | railties/test/boot_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/test/boot_test.rb b/railties/test/boot_test.rb index 02c7b461f7..7bf420d4f2 100644 --- a/railties/test/boot_test.rb +++ b/railties/test/boot_test.rb @@ -1,6 +1,6 @@ require 'abstract_unit' require 'initializer' -require "#{File.dirname(__FILE__)}/../lib/generator/templates/app/config/boot" +require "#{File.dirname(__FILE__)}/../lib/generators/rails/app/templates/config/boot" require 'rails/gem_dependency' class BootTest < Test::Unit::TestCase |