diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2017-07-23 15:55:53 -0500 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2017-07-23 15:55:53 -0500 |
| commit | 229394b5ac747d1c54dd837ed67ff721906daf37 (patch) | |
| tree | bdce405e19f3d490aa5cb3730f10d96ec689f6ea /test/controllers/disk_controller_test.rb | |
| parent | a4f36f957e013f6da34e04f0d3f1d86d86491454 (diff) | |
| parent | df698991612575fe015d27bc138c5111de384c15 (diff) | |
| download | rails-229394b5ac747d1c54dd837ed67ff721906daf37.tar.gz rails-229394b5ac747d1c54dd837ed67ff721906daf37.tar.bz2 rails-229394b5ac747d1c54dd837ed67ff721906daf37.zip | |
Merge branch 'master' into explore-polymorphism
Diffstat (limited to 'test/controllers/disk_controller_test.rb')
| -rw-r--r-- | test/controllers/disk_controller_test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/controllers/disk_controller_test.rb b/test/controllers/disk_controller_test.rb index c427942c57..58c56d2d0b 100644 --- a/test/controllers/disk_controller_test.rb +++ b/test/controllers/disk_controller_test.rb @@ -11,13 +11,13 @@ class ActiveStorage::DiskControllerTest < ActionController::TestCase end test "showing blob inline" do - get :show, params: { filename: @blob.filename, encoded_key: ActiveStorage.verifier.generate(@blob.key, expires_in: 5.minutes) } + get :show, params: { filename: @blob.filename, encoded_key: ActiveStorage.verifier.generate(@blob.key, expires_in: 5.minutes, purpose: :blob_key) } assert_equal "inline; filename=\"#{@blob.filename}\"", @response.headers["Content-Disposition"] assert_equal "text/plain", @response.headers["Content-Type"] end test "sending blob as attachment" do - get :show, params: { filename: @blob.filename, encoded_key: ActiveStorage.verifier.generate(@blob.key, expires_in: 5.minutes), disposition: :attachment } + get :show, params: { filename: @blob.filename, encoded_key: ActiveStorage.verifier.generate(@blob.key, expires_in: 5.minutes, purpose: :blob_key), disposition: :attachment } assert_equal "attachment; filename=\"#{@blob.filename}\"", @response.headers["Content-Disposition"] assert_equal "text/plain", @response.headers["Content-Type"] end |