aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2011-05-25 09:30:41 +0200
committerJosé Valim <jose.valim@gmail.com>2011-05-25 09:30:41 +0200
commit460ce7d7eac8e16e49011534e52306f3f14ca0b2 (patch)
tree182fc9f9178d9940a42121489caf8b4b8958c7e5 /railties
parent3b2ee3b2bc3a4092af7074b4b111a48fd52812fa (diff)
downloadrails-460ce7d7eac8e16e49011534e52306f3f14ca0b2.tar.gz
rails-460ce7d7eac8e16e49011534e52306f3f14ca0b2.tar.bz2
rails-460ce7d7eac8e16e49011534e52306f3f14ca0b2.zip
Use load_generators instead.
Diffstat (limited to 'railties')
-rw-r--r--railties/test/application/generators_test.rb6
1 files changed, 2 insertions, 4 deletions
diff --git a/railties/test/application/generators_test.rb b/railties/test/application/generators_test.rb
index daacea4720..1ca9515335 100644
--- a/railties/test/application/generators_test.rb
+++ b/railties/test/application/generators_test.rb
@@ -68,8 +68,7 @@ module ApplicationTests
# Initialize the application
require "#{app_path}/config/environment"
- require "rails/generators"
- Rails::Generators.configure!(Rails.application.config.generators)
+ Rails.application.load_generators
assert_equal :rspec, Rails::Generators.options[:rails][:test_framework]
assert_equal "-w", Rails::Generators.aliases[:rails][:test_framework]
@@ -84,8 +83,7 @@ module ApplicationTests
# Initialize the application
require "#{app_path}/config/environment"
- require "rails/generators"
- Rails::Generators.configure!(Rails.application.config.generators)
+ Rails.application.load_generators
assert_equal Thor::Base.shell, Thor::Shell::Basic
end