aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2011-06-28 16:53:33 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2011-06-28 16:53:33 -0700
commit31536855ae90bf2fb07c855d05837246b5aa6fb9 (patch)
treeff02635699fb069a96efd41d438c510435b74d32 /activesupport
parentff9566caf21f6f5106831e6b75fe9ec47c7d1629 (diff)
parentcd48bd2478accbb2638bcfc7e32cb62d3d0ab2cc (diff)
downloadrails-31536855ae90bf2fb07c855d05837246b5aa6fb9.tar.gz
rails-31536855ae90bf2fb07c855d05837246b5aa6fb9.tar.bz2
rails-31536855ae90bf2fb07c855d05837246b5aa6fb9.zip
Merge pull request #1883 from arunagw/time_zone_fix
Using not effected timezone in tests.
Diffstat (limited to 'activesupport')
-rw-r--r--activesupport/test/time_zone_test.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/activesupport/test/time_zone_test.rb b/activesupport/test/time_zone_test.rb
index 49cefc6e82..3575175517 100644
--- a/activesupport/test/time_zone_test.rb
+++ b/activesupport/test/time_zone_test.rb
@@ -224,9 +224,9 @@ class TimeZoneTest < Test::Unit::TestCase
end
def test_formatted_offset_positive
- zone = ActiveSupport::TimeZone['Moscow']
- assert_equal "+03:00", zone.formatted_offset
- assert_equal "+0300", zone.formatted_offset(false)
+ zone = ActiveSupport::TimeZone['New Delhi']
+ assert_equal "+05:30", zone.formatted_offset
+ assert_equal "+0530", zone.formatted_offset(false)
end
def test_formatted_offset_negative
@@ -257,7 +257,7 @@ class TimeZoneTest < Test::Unit::TestCase
end
def test_to_s
- assert_equal "(GMT+03:00) Moscow", ActiveSupport::TimeZone['Moscow'].to_s
+ assert_equal "(GMT+05:30) New Delhi", ActiveSupport::TimeZone['New Delhi'].to_s
end
def test_all_sorted