diff options
author | George Claghorn <george@basecamp.com> | 2018-03-05 11:53:31 -0500 |
---|---|---|
committer | George Claghorn <george@basecamp.com> | 2018-03-05 11:54:43 -0500 |
commit | ccac681122db9747fec9512076772bca345e24b9 (patch) | |
tree | 9648be7aa60c62b44d74e898b7a9f9888e6d7789 /activestorage/test/models | |
parent | 9cc0c1aaf4d35b79055471f1a7ef0dba692b366d (diff) | |
download | rails-ccac681122db9747fec9512076772bca345e24b9.tar.gz rails-ccac681122db9747fec9512076772bca345e24b9.tar.bz2 rails-ccac681122db9747fec9512076772bca345e24b9.zip |
Generate root-relative paths in Active Storage disk service URL methods
Fixes #32129.
Diffstat (limited to 'activestorage/test/models')
-rw-r--r-- | activestorage/test/models/attachments_test.rb | 1 | ||||
-rw-r--r-- | activestorage/test/models/blob_test.rb | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/activestorage/test/models/attachments_test.rb b/activestorage/test/models/attachments_test.rb index 25e0352eca..cb52a57b33 100644 --- a/activestorage/test/models/attachments_test.rb +++ b/activestorage/test/models/attachments_test.rb @@ -126,7 +126,6 @@ class ActiveStorage::AttachmentsTest < ActiveSupport::TestCase blob = create_blob_before_direct_upload(filename: "racecar.jpg", content_type: "application/octet-stream", byte_size: 1124062, checksum: "7GjDDNEQb4mzMzsW+MS0JQ==") ActiveStorage::Blob.service.upload(blob.key, file_fixture("racecar.jpg").open) - stub_request(:get, %r{localhost:3000/rails/active_storage/disk/.*}).to_return(body: file_fixture("racecar.jpg")) @user.avatar.attach(blob) assert_equal "image/jpeg", @user.avatar.reload.content_type diff --git a/activestorage/test/models/blob_test.rb b/activestorage/test/models/blob_test.rb index 779e47ffb6..202d0fb093 100644 --- a/activestorage/test/models/blob_test.rb +++ b/activestorage/test/models/blob_test.rb @@ -140,6 +140,6 @@ class ActiveStorage::BlobTest < ActiveSupport::TestCase def expected_url_for(blob, disposition: :inline, filename: nil) filename ||= blob.filename query_string = { content_type: blob.content_type, disposition: "#{disposition}; #{filename.parameters}" }.to_param - "http://localhost:3000/rails/active_storage/disk/#{ActiveStorage.verifier.generate(blob.key, expires_in: 5.minutes, purpose: :blob_key)}/#{filename}?#{query_string}" + "/rails/active_storage/disk/#{ActiveStorage.verifier.generate(blob.key, expires_in: 5.minutes, purpose: :blob_key)}/#{filename}?#{query_string}" end end |