aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2010-06-02 08:45:03 +0200
committerJosé Valim <jose.valim@gmail.com>2010-06-02 08:45:33 +0200
commitafc102698672cdf546a15424471d3287a39dbb06 (patch)
treecdbd7d2722f3dc38830db3b0e97c0a57bb90aef9 /railties/test
parentfdd203f964e31fd81a16be8f68462a64a17b0d92 (diff)
downloadrails-afc102698672cdf546a15424471d3287a39dbb06.tar.gz
rails-afc102698672cdf546a15424471d3287a39dbb06.tar.bz2
rails-afc102698672cdf546a15424471d3287a39dbb06.zip
Still copy application configuration to generator even if they are required earlier. Also tidy up the guide a little bit.
Diffstat (limited to 'railties/test')
-rw-r--r--railties/test/generators/generators_test_helper.rb7
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'