aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/test
diff options
context:
space:
mode:
authorPratik Naik <pratiknaik@gmail.com>2008-05-27 12:24:46 +0100
committerPratik Naik <pratiknaik@gmail.com>2008-05-27 12:24:46 +0100
commitf8b402c5d81c7baedae9a27eebf83aa947698cc0 (patch)
treef3012914003ee63ce34abf498b5015a875273b63 /activesupport/test
parent9d9c96af56986b84a732aa609569b5035825f5f8 (diff)
parent888a2927b65889465ce7a1a71e87d37640a2b41b (diff)
downloadrails-f8b402c5d81c7baedae9a27eebf83aa947698cc0.tar.gz
rails-f8b402c5d81c7baedae9a27eebf83aa947698cc0.tar.bz2
rails-f8b402c5d81c7baedae9a27eebf83aa947698cc0.zip
Merge commit 'mainstream/master'
Diffstat (limited to 'activesupport/test')
-rw-r--r--activesupport/test/time_zone_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/test/time_zone_test.rb b/activesupport/test/time_zone_test.rb
index 3757ddcedb..f3069b589b 100644
--- a/activesupport/test/time_zone_test.rb
+++ b/activesupport/test/time_zone_test.rb
@@ -252,7 +252,7 @@ class TimeZoneTest < Test::Unit::TestCase
end
def test_to_s
- assert_equal "(UTC+03:00) Moscow", TimeZone['Moscow'].to_s
+ assert_equal "(GMT+03:00) Moscow", TimeZone['Moscow'].to_s
end
def test_all_sorted