aboutsummaryrefslogtreecommitdiffstats
path: root/activestorage/test/models/blob_test.rb
diff options
context:
space:
mode:
authorGeorge Claghorn <george@basecamp.com>2018-06-21 11:06:32 -0400
committerGeorge Claghorn <george@basecamp.com>2018-06-21 11:06:32 -0400
commitb21f50d8ae36d9b50b673579e17bccbe55363b34 (patch)
treea7fb19013b31f654d198196ad2566e74e103eba1 /activestorage/test/models/blob_test.rb
parent9ee74265991e0e52e549e08c25e968195a4a880c (diff)
downloadrails-b21f50d8ae36d9b50b673579e17bccbe55363b34.tar.gz
rails-b21f50d8ae36d9b50b673579e17bccbe55363b34.tar.bz2
rails-b21f50d8ae36d9b50b673579e17bccbe55363b34.zip
Permit configuring the default service URL expiry
Diffstat (limited to 'activestorage/test/models/blob_test.rb')
-rw-r--r--activestorage/test/models/blob_test.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/activestorage/test/models/blob_test.rb b/activestorage/test/models/blob_test.rb
index 88ce0f868a..40b30acd3e 100644
--- a/activestorage/test/models/blob_test.rb
+++ b/activestorage/test/models/blob_test.rb
@@ -151,16 +151,16 @@ class ActiveStorage::BlobTest < ActiveSupport::TestCase
test "urls allow for custom options" do
blob = create_blob(filename: "original.txt")
- options = [
+ arguments = [
blob.key,
- expires_in: blob.service.url_expires_in,
+ expires_in: ActiveStorage.service_urls_expire_in,
disposition: :inline,
content_type: blob.content_type,
filename: blob.filename,
thumb_size: "300x300",
thumb_mode: "crop"
]
- assert_called_with(blob.service, :url, options) do
+ assert_called_with(blob.service, :url, arguments) do
blob.service_url(thumb_size: "300x300", thumb_mode: "crop")
end
end