diff options
author | Pratik Naik <pratiknaik@gmail.com> | 2010-01-17 03:20:30 +0530 |
---|---|---|
committer | Pratik Naik <pratiknaik@gmail.com> | 2010-01-17 03:20:30 +0530 |
commit | b04230e3bbf912d60601e9e7b797c4cd43581d51 (patch) | |
tree | 97a2f784a2ec2bfae4f960af56a9280dad6f7774 /railties/test/initializer/path_test.rb | |
parent | 867829b187969607aa12f2b0457f25da9c204db0 (diff) | |
parent | 6e3bee6cf1f0d2684152292db0a8b757249824fd (diff) | |
download | rails-b04230e3bbf912d60601e9e7b797c4cd43581d51.tar.gz rails-b04230e3bbf912d60601e9e7b797c4cd43581d51.tar.bz2 rails-b04230e3bbf912d60601e9e7b797c4cd43581d51.zip |
Merge remote branch 'mainstream/master'
Conflicts:
actionpack/lib/action_controller/metal/flash.rb
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 |