diff options
| author | Emilio Tagua <miloops@gmail.com> | 2009-09-21 14:57:24 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2009-09-21 14:57:24 -0300 |
| commit | a294d8362bfb62b7133ad0799ae1327cd5ddd1e4 (patch) | |
| tree | 477930041d5c42f2453178ab110c8455c6d702fe /railties/test/generators/generators_test_helper.rb | |
| parent | 378b02d3aa890cedabf1ef81c34a371dbbc52c25 (diff) | |
| parent | e2d0b0ee61c5a8c2626abb5ac1029b48ec1965eb (diff) | |
| download | rails-a294d8362bfb62b7133ad0799ae1327cd5ddd1e4.tar.gz rails-a294d8362bfb62b7133ad0799ae1327cd5ddd1e4.tar.bz2 rails-a294d8362bfb62b7133ad0799ae1327cd5ddd1e4.zip | |
Merge commit 'rails/master'
Diffstat (limited to 'railties/test/generators/generators_test_helper.rb')
| -rw-r--r-- | railties/test/generators/generators_test_helper.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/railties/test/generators/generators_test_helper.rb b/railties/test/generators/generators_test_helper.rb index a258574dce..2a9d680c6a 100644 --- a/railties/test/generators/generators_test_helper.rb +++ b/railties/test/generators/generators_test_helper.rb @@ -9,10 +9,12 @@ else end $LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../../lib" +require 'generators' + +require 'rubygems' $LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../../../activerecord/lib" $LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../../../actionpack/lib" -require 'generators' -require 'activerecord' +require 'active_record' require 'action_dispatch' CURRENT_PATH = File.expand_path(Dir.pwd) |