aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2016-03-05 16:52:48 -0300
committerRafael França <rafaelmfranca@gmail.com>2016-03-05 16:52:48 -0300
commit2fcd57b066e54f86470648cb13df5d0547b4f24a (patch)
treeb1f5d09945491701f3ffaad80df3ec74223676d8 /actionpack/test/controller
parentdf890780f8461eb504d2607594ea47e68d0e0b2d (diff)
parent3d6c124dc1e2911b45c23596e9f0e1d2d7ee615f (diff)
downloadrails-2fcd57b066e54f86470648cb13df5d0547b4f24a.tar.gz
rails-2fcd57b066e54f86470648cb13df5d0547b4f24a.tar.bz2
rails-2fcd57b066e54f86470648cb13df5d0547b4f24a.zip
Merge pull request #24072 from byroot/remove-http-cache-forever-version
Remove http_cache_forever's version parameter
Diffstat (limited to 'actionpack/test/controller')
-rw-r--r--actionpack/test/controller/render_test.rb10
1 files changed, 1 insertions, 9 deletions
diff --git a/actionpack/test/controller/render_test.rb b/actionpack/test/controller/render_test.rb
index b7f3e121fd..82fc8b0f8a 100644
--- a/actionpack/test/controller/render_test.rb
+++ b/actionpack/test/controller/render_test.rb
@@ -703,7 +703,7 @@ end
class HttpCacheForeverTest < ActionController::TestCase
class HttpCacheForeverController < ActionController::Base
def cache_me_forever
- http_cache_forever(public: params[:public], version: params[:version] || 'v1') do
+ http_cache_forever(public: params[:public]) do
render plain: 'hello'
end
end
@@ -742,13 +742,5 @@ class HttpCacheForeverTest < ActionController::TestCase
assert_response :not_modified
@request.if_modified_since = @response.headers['Last-Modified']
@request.if_none_match = @response.etag
-
- get :cache_me_forever, params: {version: 'v2'}
- assert_response :success
- @request.if_modified_since = @response.headers['Last-Modified']
- @request.if_none_match = @response.etag
-
- get :cache_me_forever, params: {version: 'v2'}
- assert_response :not_modified
end
end