kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Merge pull request #30424 from koic/fix_order_of_active_storage_disk_url_parameters

Browse source 
Fix order of Active Storage DiskService URL parameters
This commit is contained in:
George Claghorn 2017-08-26 11:52:50 -04:00 committed by GitHub
commit a8bc4bd41e
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
activestorage/lib/active_storage/service/disk_service.rb
View file

@ -66,7 +66,7 @@ module ActiveStorage
verified_key_with_expiration,
filename: filename, disposition: disposition, content_type: content_type
else
"/rails/active_storage/disk/#{verified_key_with_expiration}/#{filename}?disposition=#{disposition}&content_type=#{content_type}"
"/rails/active_storage/disk/#{verified_key_with_expiration}/#{filename}?content_type=#{content_type}&disposition=#{disposition}"
end
payload[:url] = generated_url

2
activestorage/test/service/disk_service_test.rb
View file

@ -8,7 +8,7 @@ class ActiveStorage::Service::DiskServiceTest < ActiveSupport::TestCase
include ActiveStorage::Service::SharedServiceTests
test "url generation" do
assert_match(/rails\/active_storage\/disk\/.*\/avatar\.png\?.+disposition=inline/,
assert_match(/rails\/active_storage\/disk\/.*\/avatar\.png\?content_type=image%2Fpng&disposition=inline/,
@service.url(FIXTURE_KEY, expires_in: 5.minutes, disposition: "inline; filename=\"avatar.png\"", filename: "avatar.png", content_type: "image/png"))
end
end