diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-01-04 18:42:40 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-01-04 18:42:40 -0300 |
| commit | 9644cdcd3deec97a48fcfa53ce75a281e8ff75fa (patch) | |
| tree | 2f0090444a4911cc9845c4abd4f1528954c9cf01 /actionview/test | |
| parent | cf6b13b2be78c5728b23f8a69aad0bf6eaee5fcb (diff) | |
| parent | ab4c900656db249caa6ff363a932168695b9021e (diff) | |
| download | rails-9644cdcd3deec97a48fcfa53ce75a281e8ff75fa.tar.gz rails-9644cdcd3deec97a48fcfa53ce75a281e8ff75fa.tar.bz2 rails-9644cdcd3deec97a48fcfa53ce75a281e8ff75fa.zip | |
Merge pull request #18328 from brainopia/remove_tz_proxy
Use directly TZInfo::Timezone without proxy
Diffstat (limited to 'actionview/test')
| -rw-r--r-- | actionview/test/template/date_helper_test.rb | 2 |
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 |