diff options
| author | claudiob <claudiob@gmail.com> | 2015-02-10 17:02:24 -0800 |
|---|---|---|
| committer | claudiob <claudiob@gmail.com> | 2015-02-10 17:02:24 -0800 |
| commit | c7331e057b4dd60aa810d3b412c43174a582432e (patch) | |
| tree | 3afe4104b9c54a852683b557d39774e03c633474 /actionpack/test/controller | |
| parent | 162581a448ac6f3e52901a90000336f394226381 (diff) | |
| download | rails-c7331e057b4dd60aa810d3b412c43174a582432e.tar.gz rails-c7331e057b4dd60aa810d3b412c43174a582432e.tar.bz2 rails-c7331e057b4dd60aa810d3b412c43174a582432e.zip | |
Fix wrong kwarg "record" from #18872
PR #18772 changed the parameters of `stale?` to use `kwargs`.
[As for this comment](https://github.com/rails/rails/pull/18872/files#r24456288)
the default value for the `etag` parameter should be `record`, not `nil`.
This commit fixes the code and introduces a test that:
- passed before #18872
- fails on the current master (after #18772)
- passes again after setting the default value of `etag` to `record`.
Diffstat (limited to 'actionpack/test/controller')
| -rw-r--r-- | actionpack/test/controller/render_test.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/actionpack/test/controller/render_test.rb b/actionpack/test/controller/render_test.rb index 1c3f436cfa..a5dd96ae91 100644 --- a/actionpack/test/controller/render_test.rb +++ b/actionpack/test/controller/render_test.rb @@ -299,6 +299,7 @@ class LastModifiedRenderTest < ActionController::TestCase get :conditional_hello_with_record assert_equal 304, @response.status.to_i assert @response.body.blank? + assert_not_nil @response.etag assert_equal @last_modified, @response.headers['Last-Modified'] end |