diff options
| author | wycats <wycats@gmail.com> | 2010-06-02 15:53:10 +0200 |
|---|---|---|
| committer | wycats <wycats@gmail.com> | 2010-06-02 15:53:10 +0200 |
| commit | 26c5680bd01bd0e525eccc5d47a2e7126d9383f7 (patch) | |
| tree | c655c56511ef89ba55c554a0aa7d82b1cd062f78 /railties/test/generators | |
| parent | b870daba5ff71973b237616fb95f90bb321ae7fb (diff) | |
| parent | 4b91daff13be43ed913a97ffc8ad1b3f77fd9690 (diff) | |
| download | rails-26c5680bd01bd0e525eccc5d47a2e7126d9383f7.tar.gz rails-26c5680bd01bd0e525eccc5d47a2e7126d9383f7.tar.bz2 rails-26c5680bd01bd0e525eccc5d47a2e7126d9383f7.zip | |
Merge branch 'master' of 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' |