aboutsummaryrefslogtreecommitdiffstats
path: root/actionview
diff options
context:
space:
mode:
authorbrainopia <brainopia@evilmartians.com>2015-01-04 19:39:49 +0300
committerbrainopia <brainopia@evilmartians.com>2015-01-04 20:08:18 +0300
commitab4c900656db249caa6ff363a932168695b9021e (patch)
tree5b5ed0b8d45fd5be33378ab232b921a6480fbe27 /actionview
parent6489a84eb69162ccefac106d08bae1c31a2b4fa5 (diff)
downloadrails-ab4c900656db249caa6ff363a932168695b9021e.tar.gz
rails-ab4c900656db249caa6ff363a932168695b9021e.tar.bz2
rails-ab4c900656db249caa6ff363a932168695b9021e.zip
Use directly TZInfo::Timezone without proxy
Since real timezone is loaded anyway in `#utc_offset` which is called during `#create`
Diffstat (limited to 'actionview')
-rw-r--r--actionview/test/template/date_helper_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionview/test/template/date_helper_test.rb b/actionview/test/template/date_helper_test.rb
index a6962b5200..bfb073680e 100644
--- a/actionview/test/template/date_helper_test.rb
+++ b/actionview/test/template/date_helper_test.rb
@@ -2330,7 +2330,7 @@ class DateHelperTest < ActionView::TestCase
# The love zone is UTC+0
mytz = Class.new(ActiveSupport::TimeZone) {
attr_accessor :now
- }.create('tenderlove', 0)
+ }.create('tenderlove', 0, ActiveSupport::TimeZone.find_tzinfo('UTC'))
now = Time.mktime(2004, 6, 15, 16, 35, 0)
mytz.now = now