diff options
| author | Andrew White <andrew.white@unboxed.co> | 2018-03-26 14:36:39 +0100 |
|---|---|---|
| committer | Andrew White <andrew.white@unboxed.co> | 2018-04-06 20:07:52 +0100 |
| commit | 9436c22e2aa9419f275186967a1b863bc3d01ecb (patch) | |
| tree | 3a833e8e5f773d0f6668b44d15bceb644db932a3 /activestorage/test/service | |
| parent | 03bd370c02a8fa83ab6dd01bdd99fe342c523b81 (diff) | |
| download | rails-9436c22e2aa9419f275186967a1b863bc3d01ecb.tar.gz rails-9436c22e2aa9419f275186967a1b863bc3d01ecb.tar.bz2 rails-9436c22e2aa9419f275186967a1b863bc3d01ecb.zip | |
Use a current model to provide the host for service urls
Trying to pass the current request down to the service so that it can
create full urls instead of paths makes the API messy so use a model
based on ActiveSupport::CurrentAttributes to provide the current host
to services that need it (primarily the disk service).
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 |