diff options
| author | Rizwan Reza <rizwanreza@gmail.com> | 2010-06-05 04:04:49 +0430 |
|---|---|---|
| committer | Rizwan Reza <rizwanreza@gmail.com> | 2010-06-05 04:04:49 +0430 |
| commit | e6f2102178b19ac8d49363b5fa145f22483c30ee (patch) | |
| tree | b5dff24210eb3f521087fe66a9b734165ad22967 /railties/test/generators | |
| parent | 1535b02a9f8e0eaa3cd3182a45d2bd7855c3809c (diff) | |
| parent | 8e8cb1769f3a78c53e5b79d0ce6a08589045cfca (diff) | |
| download | rails-e6f2102178b19ac8d49363b5fa145f22483c30ee.tar.gz rails-e6f2102178b19ac8d49363b5fa145f22483c30ee.tar.bz2 rails-e6f2102178b19ac8d49363b5fa145f22483c30ee.zip | |
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'railties/test/generators')
| -rw-r--r-- | railties/test/generators/generators_test_helper.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/railties/test/generators/generators_test_helper.rb b/railties/test/generators/generators_test_helper.rb index d8bdb344f2..4a5a9b2932 100644 --- a/railties/test/generators/generators_test_helper.rb +++ b/railties/test/generators/generators_test_helper.rb @@ -1,4 +1,6 @@ require 'abstract_unit' +require 'rails/generators' +require 'rails/generators/test_case' module Rails def self.root @@ -8,8 +10,9 @@ end Rails.application.config.root = Rails.root Rails.application.config.generators.templates = [File.join(Rails.root, "lib", "templates")] -require 'rails/generators' -require 'rails/generators/test_case' +# Call configure to load the settings from +# Rails.application.config.generators to Rails::Generators +Rails::Generators.configure! require 'active_record' require 'action_dispatch' |