github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-04 03:00:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

InstanceTag#default_time_from_options overflows to DateTime

Browse Source
This commit is contained in:
gbuesing
2008-05-18 10:59:24 -05:00
parent be85868987
commit e30a263bf1
3 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
actionpack/CHANGELOG
View File

@@ -1,3 +1,5 @@
* InstanceTag#default_time_from_options overflows to DateTime [Geoff Buesing]
*2.1.0 RC1 (May 11th, 2008)*
* Fixed that forgery protection can be used without session tracking (Peter Jones) [#139]

2
actionpack/lib/action_view/helpers/date_helper.rb
View File

@@ -689,7 +689,7 @@ module ActionView
default[key] ||= time.send(key)
end
Time.utc(default[:year], default[:month], default[:day], default[:hour], default[:min], default[:sec])
Time.utc_time(default[:year], default[:month], default[:day], default[:hour], default[:min], default[:sec])
end
end
end

6
actionpack/test/template/date_helper_test.rb
View File

@@ -1722,6 +1722,12 @@ class DateHelperTest < ActionView::TestCase
assert_equal 2, dummy_instance_tag.send!(:default_time_from_options, :hour => 2).hour
end
end
def test_instance_tag_default_time_from_options_handles_far_future_date
dummy_instance_tag = ActionView::Helpers::InstanceTag.new(1,2,3)
time = dummy_instance_tag.send!(:default_time_from_options, :year => 2050, :month => 2, :day => 10, :hour => 15, :min => 30, :sec => 45)
assert_equal 2050, time.year
end
end
protected