diff options
| author | Marc-Andre Lafortune <github@marc-andre.ca> | 2012-11-14 16:37:28 -0500 |
|---|---|---|
| committer | Marc-Andre Lafortune <github@marc-andre.ca> | 2012-11-14 16:49:33 -0500 |
| commit | dc3ac357dc21c8ba05de95760da2b2c9f963012e (patch) | |
| tree | 29dbce8aa752513aa417d1c0842a5966844bbd20 /actionpack/test/template | |
| parent | 2f3d81c764a8b527299be8c33c64814431f83482 (diff) | |
| download | rails-dc3ac357dc21c8ba05de95760da2b2c9f963012e.tar.gz rails-dc3ac357dc21c8ba05de95760da2b2c9f963012e.tar.bz2 rails-dc3ac357dc21c8ba05de95760da2b2c9f963012e.zip | |
Avoid using Integer#/, as it is redefined by the 'mathn' stdlib
Diffstat (limited to 'actionpack/test/template')
| -rw-r--r-- | actionpack/test/template/date_helper_test.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/actionpack/test/template/date_helper_test.rb b/actionpack/test/template/date_helper_test.rb index 8bd8eff3c0..f9ce63fcb0 100644 --- a/actionpack/test/template/date_helper_test.rb +++ b/actionpack/test/template/date_helper_test.rb @@ -19,6 +19,8 @@ class DateHelperTest < ActionView::TestCase end def assert_distance_of_time_in_words(from, to=nil) + Fixnum.send :private, :/ # test we avoid Integer#/ (redefined by mathn) + to ||= from # 0..1 minute with :include_seconds => true @@ -121,6 +123,9 @@ class DateHelperTest < ActionView::TestCase assert_equal "about 4 hours", distance_of_time_in_words(from + 4.hours, to) assert_equal "less than 20 seconds", distance_of_time_in_words(from + 19.seconds, to, :include_seconds => true) assert_equal "less than a minute", distance_of_time_in_words(from + 19.seconds, to, :include_seconds => false) + + ensure + Fixnum.send :public, :/ end def test_distance_in_words |