aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-08-03 14:45:10 -0700
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-08-03 14:45:10 -0700
commit73abbdec27bf556d671b566115bdc2362939dfec (patch)
tree9d832f2d156f1abd0524338972025f2fc5b22328 /activerecord
parentfc2d79b6e259e62cc4eac8343e23ba777cb9a1b4 (diff)
parentd0dbf3928905b6ea07c1484de829a18b341115db (diff)
downloadrails-73abbdec27bf556d671b566115bdc2362939dfec.tar.gz
rails-73abbdec27bf556d671b566115bdc2362939dfec.tar.bz2
rails-73abbdec27bf556d671b566115bdc2362939dfec.zip
Merge pull request #11741 from Karunakar/failing_test_in_local
fix for postgresql failing test in local
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/test/cases/adapters/postgresql/datatype_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/test/cases/adapters/postgresql/datatype_test.rb b/activerecord/test/cases/adapters/postgresql/datatype_test.rb
index 36d7294bc8..e946b8bb22 100644
--- a/activerecord/test/cases/adapters/postgresql/datatype_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/datatype_test.rb
@@ -594,7 +594,7 @@ _SQL
@connection.reconnect!
@first_timestamp_with_zone = PostgresqlTimestampWithZone.find(1)
- assert_equal Time.utc(2010,1,1, 11,0,0), @first_timestamp_with_zone.time
+ assert_equal Time.local(2010,1,1, 11,0,0), @first_timestamp_with_zone.time
assert_instance_of Time, @first_timestamp_with_zone.time
ensure
ActiveRecord::Base.default_timezone = old_default_tz