diff options
author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-01-22 09:29:20 -0200 |
---|---|---|
committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-01-22 09:29:20 -0200 |
commit | b45c63b8c0d8e8e92207c2d049a5d764aa12a39d (patch) | |
tree | c92ec00a834b5127cda7202066affcd1ff6e7845 /railties/test/application | |
parent | 2bca2f6418a7167a813e63c3efc6334815f49c80 (diff) | |
download | rails-b45c63b8c0d8e8e92207c2d049a5d764aa12a39d.tar.gz rails-b45c63b8c0d8e8e92207c2d049a5d764aa12a39d.tar.bz2 rails-b45c63b8c0d8e8e92207c2d049a5d764aa12a39d.zip |
Revert "Set the default timezone after the initialization since the configuration"
This reverts commit 39374aa925a7d670b039c0c0c9aa9f4aef19466b.
Diffstat (limited to 'railties/test/application')
-rw-r--r-- | railties/test/application/configuration_test.rb | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/railties/test/application/configuration_test.rb b/railties/test/application/configuration_test.rb index 78aefa1437..7b45623f6c 100644 --- a/railties/test/application/configuration_test.rb +++ b/railties/test/application/configuration_test.rb @@ -417,17 +417,7 @@ module ApplicationTests require "#{app_path}/config/environment" - 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 + assert_equal "Wellington", Rails.application.config.time_zone end test "raises when an invalid timezone is defined in the config" do |