mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Merge pull request #36715 from peterzhu2118/azure-content-type
Add content_type to upload method for Azure
This commit is contained in:
commit
dc7b650e15
2 changed files with 16 additions and 2 deletions
|
@ -17,10 +17,10 @@ module ActiveStorage
|
||||||
@container = container
|
@container = container
|
||||||
end
|
end
|
||||||
|
|
||||||
def upload(key, io, checksum: nil, **)
|
def upload(key, io, checksum: nil, content_type: nil, **)
|
||||||
instrument :upload, key: key, checksum: checksum do
|
instrument :upload, key: key, checksum: checksum do
|
||||||
handle_errors do
|
handle_errors do
|
||||||
blobs.create_block_blob(container, key, IO.try_convert(io) || io, content_md5: checksum)
|
blobs.create_block_blob(container, key, IO.try_convert(io) || io, content_md5: checksum, content_type: content_type)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -9,6 +9,20 @@ if SERVICE_CONFIGURATIONS[:azure]
|
||||||
|
|
||||||
include ActiveStorage::Service::SharedServiceTests
|
include ActiveStorage::Service::SharedServiceTests
|
||||||
|
|
||||||
|
test "upload with content_type" do
|
||||||
|
key = SecureRandom.base58(24)
|
||||||
|
data = "Foobar"
|
||||||
|
|
||||||
|
@service.upload(key, StringIO.new(data), checksum: Digest::MD5.base64digest(data), filename: ActiveStorage::Filename.new("test.txt"), content_type: "text/plain")
|
||||||
|
|
||||||
|
url = @service.url(key, expires_in: 2.minutes, disposition: :attachment, content_type: nil, filename: ActiveStorage::Filename.new("test.html"))
|
||||||
|
response = Net::HTTP.get_response(URI(url))
|
||||||
|
assert_equal "text/plain", response.content_type
|
||||||
|
assert_match(/attachment;.*test\.html/, response["Content-Disposition"])
|
||||||
|
ensure
|
||||||
|
@service.delete key
|
||||||
|
end
|
||||||
|
|
||||||
test "signed URL generation" do
|
test "signed URL generation" do
|
||||||
url = @service.url(@key, expires_in: 5.minutes,
|
url = @service.url(@key, expires_in: 5.minutes,
|
||||||
disposition: :inline, filename: ActiveStorage::Filename.new("avatar.png"), content_type: "image/png")
|
disposition: :inline, filename: ActiveStorage::Filename.new("avatar.png"), content_type: "image/png")
|
||||||
|
|
Loading…
Reference in a new issue