diff options
author | Mikel Lindsaar <raasdnil@gmail.com> | 2010-01-17 12:46:51 +1100 |
---|---|---|
committer | Mikel Lindsaar <raasdnil@gmail.com> | 2010-01-17 12:46:51 +1100 |
commit | 6f663addaa7ed40f1133687d7a2be0958bf0c059 (patch) | |
tree | 7beb7f092c1979d1fd5ea6e7aaaf4f59c2f4abf4 /railties/test/initializer/path_test.rb | |
parent | 8834b2612b7ddda70ee6a685eb0063d3daa8e63d (diff) | |
parent | 3e94032227d450d479f511070c51f37f53d0ecc4 (diff) | |
download | rails-6f663addaa7ed40f1133687d7a2be0958bf0c059.tar.gz rails-6f663addaa7ed40f1133687d7a2be0958bf0c059.tar.bz2 rails-6f663addaa7ed40f1133687d7a2be0958bf0c059.zip |
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'railties/test/initializer/path_test.rb')
-rw-r--r-- | railties/test/initializer/path_test.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/railties/test/initializer/path_test.rb b/railties/test/initializer/path_test.rb index bfb1887d11..328dda6d2c 100644 --- a/railties/test/initializer/path_test.rb +++ b/railties/test/initializer/path_test.rb @@ -63,7 +63,7 @@ module InitializerTests 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 @@ -85,17 +85,17 @@ module InitializerTests end test "controller paths include builtin in development mode" do - RAILS_ENV.replace "development" + Rails.env.replace "development" assert Rails::Configuration.new.paths.app.controllers.paths.any? { |p| p =~ /builtin/ } end test "controller paths does not have builtin_directories in test mode" do - RAILS_ENV.replace "test" + Rails.env.replace "test" assert !Rails::Configuration.new.paths.app.controllers.paths.any? { |p| p =~ /builtin/ } end test "controller paths does not have builtin_directories in production mode" do - RAILS_ENV.replace "production" + Rails.env.replace "production" assert !Rails::Configuration.new.paths.app.controllers.paths.any? { |p| p =~ /builtin/ } end |