1 files changed, 33 insertions, 1 deletions
diff --git a/railties/test/application/configuration_test.rb b/railties/test/application/configuration_test.rb
index ae1127b509..f9108ed7b9 100644
--- a/railties/test/application/configuration_test.rb
+++ b/railties/test/application/configuration_test.rb
@@ -1,5 +1,6 @@
 require "isolation/abstract_unit"
 require 'rack/test'
+require 'env_helpers'
 
 class ::MyMailInterceptor
   def self.delivering_email(email); email; end
@@ -17,6 +18,7 @@ module ApplicationTests
   class ConfigurationTest < ActiveSupport::TestCase
     include ActiveSupport::Testing::Isolation
     include Rack::Test::Methods
+    include EnvHelpers
 
     def new_app
       File.expand_path("#{app_path}/../new_app")
@@ -41,6 +43,16 @@ module ApplicationTests
       FileUtils.rm_rf(new_app) if File.directory?(new_app)
     end
 
+    test "Rails.env does not set the RAILS_ENV environment variable which would leak out into rake tasks" do
+      require "rails"
+
+      switch_env "RAILS_ENV", nil do
+        Rails.env = "development"
+        assert_equal "development", Rails.env
+        assert_nil ENV['RAILS_ENV']
+      end
+    end
+
     test "a renders exception on pending migration" do
       add_to_config <<-RUBY
         config.active_record.migration_error    = :page_load
@@ -180,6 +192,16 @@ module ApplicationTests
       end
     end
 
+    test "filter_parameters should be able to set via config.filter_parameters in an initializer" do
+      app_file 'config/initializers/filter_parameters_logging.rb', <<-RUBY
+        Rails.application.config.filter_parameters += [ :password, :foo, 'bar' ]
+      RUBY
+
+      require "#{app_path}/config/environment"
+
+      assert_equal [:password, :foo, 'bar'], Rails.application.env_config['action_dispatch.parameter_filter']
+    end
+
     test "config.to_prepare is forwarded to ActionDispatch" do
       $prepared = false
 
@@ -395,7 +417,17 @@ module ApplicationTests
 
       require "#{app_path}/config/environment"
 
-      assert_equal "Wellington", Rails.application.config.time_zone
+      assert_equal Time.find_zone!("Wellington"), Time.zone_default
+    end
+
+    test "timezone can be set on initializers" do
+      app_file "config/initializers/locale.rb", <<-RUBY
+        Rails.application.config.time_zone = "Central Time (US & Canada)"
+      RUBY
+
+      require "#{app_path}/config/environment"
+
+      assert_equal Time.find_zone!("Central Time (US & Canada)"), Time.zone_default
     end
 
     test "raises when an invalid timezone is defined in the config" do