diff options
| author | Andrew White <pixeltrix@users.noreply.github.com> | 2018-04-07 08:20:16 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-07 08:20:16 +0100 |
| commit | ec7c89b5160015c014aad0c90f5679252a91cb37 (patch) | |
| tree | d78e92d398270a1484027eda29100b5f8e33ae13 /activestorage/test/service | |
| parent | cb2f69659e01a9ec4b09c70f2357b426ca9a1264 (diff) | |
| parent | 9436c22e2aa9419f275186967a1b863bc3d01ecb (diff) | |
| download | rails-ec7c89b5160015c014aad0c90f5679252a91cb37.tar.gz rails-ec7c89b5160015c014aad0c90f5679252a91cb37.tar.bz2 rails-ec7c89b5160015c014aad0c90f5679252a91cb37.zip | |
Merge pull request #32350 from rails/use-current-model-for-as-url-host
Use an ActiveSupport::CurrentAttributes model to provide the host for service urls
Diffstat (limited to 'activestorage/test/service')
| -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 4a6361b920..d7142de458 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\?content_type=image%2Fpng&disposition=inline/, + assert_match(/^https:\/\/example.com\/rails\/active_storage\/disk\/.*\/avatar\.png\?content_type=image%2Fpng&disposition=inline/, @service.url(FIXTURE_KEY, expires_in: 5.minutes, disposition: :inline, filename: ActiveStorage::Filename.new("avatar.png"), content_type: "image/png")) end end |