summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2012-03-17 12:49:47 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2012-03-17 12:49:47 +0000
commitfec3e6c84b6fb4fb11ce3b93252ac8269b98c988 (patch)
treee8b1febcc6f83697765667d6c256d4e8921ef3e6
parent7c5635f6c62bd69cc668e35665d08d175ef15e5f (diff)
downloadredmine-fec3e6c84b6fb4fb11ce3b93252ac8269b98c988.tar.gz
redmine-fec3e6c84b6fb4fb11ce3b93252ac8269b98c988.zip
Fixed: ruby 1.9.3 Time Zone setting Internal error (#10442).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9244 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--Gemfile1
-rw-r--r--test/unit/lib/redmine/i18n_test.rb9
2 files changed, 10 insertions, 0 deletions
diff --git a/Gemfile b/Gemfile
index 535e29aaa..e6181298a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,6 +4,7 @@ gem "rails", "2.3.14"
gem "i18n", "~> 0.4.2"
gem "coderay", "~> 1.0.0"
gem "fastercsv", "~> 1.5.0", :platforms => [:mri_18, :mingw_18, :jruby]
+gem "tzinfo", "~> 0.3.31"
# Optional gem for LDAP authentication
group :ldap do
diff --git a/test/unit/lib/redmine/i18n_test.rb b/test/unit/lib/redmine/i18n_test.rb
index 01c32b5d2..aeb900f87 100644
--- a/test/unit/lib/redmine/i18n_test.rb
+++ b/test/unit/lib/redmine/i18n_test.rb
@@ -60,6 +60,15 @@ class Redmine::I18nTest < ActiveSupport::TestCase
end
end
+ def test_time_for_each_zone
+ ActiveSupport::TimeZone.all.each do |zone|
+ User.current.stubs(:time_zone).returns(zone.name)
+ assert_nothing_raised "#{zone} failure" do
+ format_time(Time.now)
+ end
+ end
+ end
+
def test_time_format
set_language_if_valid 'en'
now = Time.parse('2011-02-20 15:45:22')