diff options
| author | Sean Griffin <sean@seantheprogrammer.com> | 2015-10-22 07:07:27 -0600 |
|---|---|---|
| committer | Sean Griffin <sean@seantheprogrammer.com> | 2015-10-22 07:07:27 -0600 |
| commit | b1e40cff80a58c6fdf95f2f9394badd70c36cb44 (patch) | |
| tree | 9f35be1d3c16654bf7cfdfff0bdf623358486511 /actionpack | |
| parent | 3eda77f0eeeb479355b8845aa71cb0da1acd583d (diff) | |
| parent | 0d2ce9d72396f449a15a3f914248cbc8cc8a4a4f (diff) | |
| download | rails-b1e40cff80a58c6fdf95f2f9394badd70c36cb44.tar.gz rails-b1e40cff80a58c6fdf95f2f9394badd70c36cb44.tar.bz2 rails-b1e40cff80a58c6fdf95f2f9394badd70c36cb44.zip | |
Merge pull request #19327 from rousisk/master
Change Integer#year to return a Fixnum instead of a Float to improve consistency
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/test/controller/render_test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/test/controller/render_test.rb b/actionpack/test/controller/render_test.rb index 82c7ebf568..256ebf6a07 100644 --- a/actionpack/test/controller/render_test.rb +++ b/actionpack/test/controller/render_test.rb @@ -629,13 +629,13 @@ class HttpCacheForeverTest < ActionController::TestCase def test_cache_with_public get :cache_me_forever, params: {public: true} - assert_equal "max-age=#{100.years.to_i}, public", @response.headers["Cache-Control"] + assert_equal "max-age=#{100.years}, public", @response.headers["Cache-Control"] assert_not_nil @response.etag end def test_cache_with_private get :cache_me_forever - assert_equal "max-age=#{100.years.to_i}, private", @response.headers["Cache-Control"] + assert_equal "max-age=#{100.years}, private", @response.headers["Cache-Control"] assert_not_nil @response.etag assert_response :success end |