aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/template
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2012-01-24 15:06:27 -0800
committerAaron Patterson <aaron.patterson@gmail.com>2012-01-24 15:06:27 -0800
commit1d67f1ade761db75bceb30d914c4280cc3dbc984 (patch)
treeb642fb4ff0d6168304bcb0e4fd8c433e84959683 /actionpack/test/template
parentdc81d0054bc5f2eba6f65c32e112a4859a302f29 (diff)
parent59a408eb64729909aca15ef59291aea2cef951e2 (diff)
downloadrails-1d67f1ade761db75bceb30d914c4280cc3dbc984.tar.gz
rails-1d67f1ade761db75bceb30d914c4280cc3dbc984.tar.bz2
rails-1d67f1ade761db75bceb30d914c4280cc3dbc984.zip
Merge pull request #4639 from joevandyk/datetime-infinity-select-fix
datetime_select fix for dates of -infinity and +infinity
Diffstat (limited to 'actionpack/test/template')
-rw-r--r--actionpack/test/template/date_helper_test.rb12
1 files changed, 12 insertions, 0 deletions
diff --git a/actionpack/test/template/date_helper_test.rb b/actionpack/test/template/date_helper_test.rb
index 9e2f4ec347..584d1830eb 100644
--- a/actionpack/test/template/date_helper_test.rb
+++ b/actionpack/test/template/date_helper_test.rb
@@ -2118,6 +2118,18 @@ class DateHelperTest < ActionView::TestCase
assert_dom_equal expected, datetime_select("post", "updated_at", { :date_separator => " / ", :datetime_separator => " , ", :time_separator => " - ", :include_seconds => true })
end
+ def test_datetime_select_with_integer
+ @post = Post.new
+ @post.updated_at = 3
+ datetime_select("post", "updated_at")
+ end
+
+ def test_datetime_select_with_infinity # Float
+ @post = Post.new
+ @post.updated_at = (-1.0/0)
+ datetime_select("post", "updated_at")
+ end
+
def test_datetime_select_with_default_prompt
@post = Post.new
@post.updated_at = nil