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/rails_generator/rails_controller_generator_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/rails_generator/rails_controller_generator_test.rb')
-rw-r--r-- | railties/test/rails_generator/rails_controller_generator_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/test/rails_generator/rails_controller_generator_test.rb b/railties/test/rails_generator/rails_controller_generator_test.rb index 43fbe972e2..6cbb6bf2bd 100644 --- a/railties/test/rails_generator/rails_controller_generator_test.rb +++ b/railties/test/rails_generator/rails_controller_generator_test.rb @@ -1,4 +1,4 @@ -require 'generators/generator_test_helper' +require 'rails_generator/generator_test_helper' module Admin end |