aboutsummaryrefslogtreecommitdiffstats
path: root/test/controllers/disk_controller_test.rb
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2017-07-23 13:19:32 -0500
committerDavid Heinemeier Hansson <david@loudthinking.com>2017-07-23 13:19:32 -0500
commit347dc166324c108b4a9c25c5ab03222a2f42b1d0 (patch)
treea268301da79b96278bc99439812f8c2c034fd000 /test/controllers/disk_controller_test.rb
parentc285c6824dc186e00040b7283877fea917050275 (diff)
downloadrails-347dc166324c108b4a9c25c5ab03222a2f42b1d0.tar.gz
rails-347dc166324c108b4a9c25c5ab03222a2f42b1d0.tar.bz2
rails-347dc166324c108b4a9c25c5ab03222a2f42b1d0.zip
VerifiedKeyWithExpiration no longer needed
Thanks to rails/rails#29854! This does mean that we now depend on rails/rails master.
Diffstat (limited to 'test/controllers/disk_controller_test.rb')
-rw-r--r--test/controllers/disk_controller_test.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/controllers/disk_controller_test.rb b/test/controllers/disk_controller_test.rb
index 3e3f70de7a..c427942c57 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::VerifiedKeyWithExpiration.encode(@blob.key, expires_in: 5.minutes) }
+ get :show, params: { filename: @blob.filename, encoded_key: ActiveStorage.verifier.generate(@blob.key, expires_in: 5.minutes) }
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::VerifiedKeyWithExpiration.encode(@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), disposition: :attachment }
assert_equal "attachment; filename=\"#{@blob.filename}\"", @response.headers["Content-Disposition"]
assert_equal "text/plain", @response.headers["Content-Type"]
end