From e130a0e7b476553c538075239554247e4196dd05 Mon Sep 17 00:00:00 2001 From: Prathamesh Sonpatki Date: Wed, 5 Nov 2014 14:27:07 +0530 Subject: Fix broken string_ext_test due to change in timezone - Russian time was changed to UTC+3 from UTC+4 recently. This broke the string_to_ext test. --- activesupport/test/core_ext/string_ext_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'activesupport/test/core_ext') diff --git a/activesupport/test/core_ext/string_ext_test.rb b/activesupport/test/core_ext/string_ext_test.rb index 35095f2b2d..b97aa56aef 100644 --- a/activesupport/test/core_ext/string_ext_test.rb +++ b/activesupport/test/core_ext/string_ext_test.rb @@ -418,7 +418,7 @@ class StringConversionsTest < ActiveSupport::TestCase now = Time.now assert_equal Time.local(now.year, now.month, now.day, 23, 50), "23:50".to_time assert_equal Time.utc(now.year, now.month, now.day, 23, 50), "23:50".to_time(:utc) - assert_equal Time.local(now.year, now.month, now.day, 18, 50), "13:50 -0100".to_time + assert_equal Time.local(now.year, now.month, now.day, 17, 50), "13:50 -0100".to_time assert_equal Time.utc(now.year, now.month, now.day, 23, 50), "22:50 -0100".to_time(:utc) end end -- cgit v1.2.3