diff options
| author | Robin Dupret <robin.dupret@gmail.com> | 2017-05-22 21:56:43 +0200 |
|---|---|---|
| committer | Robin Dupret <robin.dupret@gmail.com> | 2017-05-30 13:46:21 +0200 |
| commit | ba84867549a2bb5c1d3cb0bec8cf9f41e46f6d74 (patch) | |
| tree | 7c68ae5c2c515b7ce91429a57eadc543718b365f | |
| parent | 845aabbcd3805420090f8b92b50a4562577cf210 (diff) | |
| download | rails-ba84867549a2bb5c1d3cb0bec8cf9f41e46f6d74.tar.gz rails-ba84867549a2bb5c1d3cb0bec8cf9f41e46f6d74.tar.bz2 rails-ba84867549a2bb5c1d3cb0bec8cf9f41e46f6d74.zip | |
Remove requirement on mathn
The test using mathn was first introduced in f1d9179 to check that the
`distance_of_time_in_words` properly doesn't use the `Fixnum#/` method
by explicitly requiring this library as it redefines this method.
Given that `mathn` has been gemified in Ruby 2.5 and is deprecated since
version 2.2, we can certainly safely assume that people will most-likely
not require this library in their application.
However, to make sure that we don't regress, let's add a test similar to
the one before f1d9179.
| -rw-r--r-- | Gemfile | 4 | ||||
| -rw-r--r-- | Gemfile.lock | 2 | ||||
| -rw-r--r-- | actionview/test/template/date_helper_test.rb | 14 |
3 files changed, 11 insertions, 9 deletions
@@ -154,7 +154,3 @@ end gem "ibm_db" if ENV["IBM_DB"] gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby] gem "wdm", ">= 0.1.0", platforms: [:mingw, :mswin, :x64_mingw, :mswin64] - -platforms :ruby_25 do - gem "mathn" -end diff --git a/Gemfile.lock b/Gemfile.lock index 2b8cc2862c..3a6743ce2f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -209,7 +209,6 @@ GEM nokogiri (>= 1.5.9) mail (2.6.5) mime-types (>= 1.16, < 4) - mathn (0.1.0) metaclass (0.0.4) method_source (0.8.2) mime-types (3.1) @@ -397,7 +396,6 @@ DEPENDENCIES kindlerb (~> 1.2.0) libxml-ruby listen (>= 3.0.5, < 3.2) - mathn minitest (< 5.3.4) mocha (~> 0.14) mysql2 (>= 0.4.4) diff --git a/actionview/test/template/date_helper_test.rb b/actionview/test/template/date_helper_test.rb index a259752d6a..b667303318 100644 --- a/actionview/test/template/date_helper_test.rb +++ b/actionview/test/template/date_helper_test.rb @@ -138,11 +138,19 @@ class DateHelperTest < ActionView::TestCase assert_equal "10 minutes", distance_of_time_in_words(Time.at(600), 0) end - def test_distance_in_words_with_mathn_required - # test we avoid Integer#/ (redefined by mathn) - silence_warnings { require "mathn" } + def test_distance_in_words_doesnt_use_the_quotient_operator + rubinius_skip "Date is written in Ruby and relies on Fixnum#/" + jruby_skip "Date is written in Ruby and relies on Fixnum#/" + + klass = RUBY_VERSION > "2.4" ? Integer : Fixnum + + # Make sure that we avoid {Integer,Fixnum}#/ (redefined by mathn) + klass.send :private, :/ + from = Time.utc(2004, 6, 6, 21, 45, 0) assert_distance_of_time_in_words(from) + ensure + klass.send :public, :/ end def test_time_ago_in_words_passes_include_seconds |