diff options
| author | Steve Klabnik <steve@steveklabnik.com> | 2013-01-22 05:44:28 -0800 |
|---|---|---|
| committer | Steve Klabnik <steve@steveklabnik.com> | 2013-01-22 05:44:28 -0800 |
| commit | 94f7583497a1f4d08bc70637c8d9709dd53069a7 (patch) | |
| tree | b7b9da4d9384cf64f3735f7d9fb738fa3e00a54c /railties/test | |
| parent | cb56c39b5186255d8208c6139669ca74e75d5759 (diff) | |
| parent | 6fcdcfe1e5fe8780f3c9c56bb4a0b7963f313e4e (diff) | |
| download | rails-94f7583497a1f4d08bc70637c8d9709dd53069a7.tar.gz rails-94f7583497a1f4d08bc70637c8d9709dd53069a7.tar.bz2 rails-94f7583497a1f4d08bc70637c8d9709dd53069a7.zip | |
Merge pull request #9027 from carlosantoniodasilva/revert-locale
Revert locale
Diffstat (limited to 'railties/test')
| -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 |