diff options
| author | George Claghorn <george.claghorn@gmail.com> | 2017-08-26 11:52:50 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-26 11:52:50 -0400 |
| commit | a8bc4bd41edab5175514d9195b87d76e646a388a (patch) | |
| tree | b22eae531b819e2c40bb6f83788953c205471936 /activestorage/test/service/disk_service_test.rb | |
| parent | 114d4e05900f1d3dee094338ddd764c0537f9a74 (diff) | |
| parent | 9e470b24c8869ac739a438132cdd5648bc6fe333 (diff) | |
| download | rails-a8bc4bd41edab5175514d9195b87d76e646a388a.tar.gz rails-a8bc4bd41edab5175514d9195b87d76e646a388a.tar.bz2 rails-a8bc4bd41edab5175514d9195b87d76e646a388a.zip | |
Merge pull request #30424 from koic/fix_order_of_active_storage_disk_url_parameters
Fix order of Active Storage DiskService URL parameters
Diffstat (limited to 'activestorage/test/service/disk_service_test.rb')
| -rw-r--r-- | activestorage/test/service/disk_service_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activestorage/test/service/disk_service_test.rb b/activestorage/test/service/disk_service_test.rb index f57e44536a..e07d1d88bc 100644 --- a/activestorage/test/service/disk_service_test.rb +++ b/activestorage/test/service/disk_service_test.rb @@ -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 |