diff options
Diffstat (limited to 'railties/test/application')
| -rw-r--r-- | railties/test/application/generators_test.rb | 6 | ||||
| -rw-r--r-- | railties/test/application/paths_test.rb | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/railties/test/application/generators_test.rb b/railties/test/application/generators_test.rb index 8b840fffd0..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.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.load_generators assert_equal Thor::Base.shell, Thor::Shell::Basic end diff --git a/railties/test/application/paths_test.rb b/railties/test/application/paths_test.rb index b1ff6e9cb1..03e0247556 100644 --- a/railties/test/application/paths_test.rb +++ b/railties/test/application/paths_test.rb @@ -61,7 +61,7 @@ module ApplicationTests end test "environments has a glob equal to the current environment" do - assert_equal "#{Rails.env}.rb", @paths.config.environments.glob + assert_equal "#{Rails.env}.rb", @paths["config/environments"].glob end test "load path includes each of the paths in config.paths as long as the directories exist" do |