diff options
| author | Rafael França <rafael@franca.dev> | 2019-07-23 10:37:47 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-23 10:37:47 -0400 |
| commit | fc175375e13d50213e796700c48ec0ab0b60b2fc (patch) | |
| tree | e9988faa2b57beb3dc8f9fbe37efd19777ba9b15 /activestorage/test/service/disk_service_test.rb | |
| parent | 31105c81cc82ae829c382a4eee2c5aa362882dea (diff) | |
| parent | b07ce56a383e0ab1514e149b7c9ad2177ea59514 (diff) | |
| download | rails-fc175375e13d50213e796700c48ec0ab0b60b2fc.tar.gz rails-fc175375e13d50213e796700c48ec0ab0b60b2fc.tar.bz2 rails-fc175375e13d50213e796700c48ec0ab0b60b2fc.zip | |
Merge pull request #36642 from wagenet/fix-disk-service-host
Fix host for ActiveStorage DiskService
Diffstat (limited to 'activestorage/test/service/disk_service_test.rb')
| -rw-r--r-- | activestorage/test/service/disk_service_test.rb | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/activestorage/test/service/disk_service_test.rb b/activestorage/test/service/disk_service_test.rb index f3c4dd26bd..b766cc3f56 100644 --- a/activestorage/test/service/disk_service_test.rb +++ b/activestorage/test/service/disk_service_test.rb @@ -8,8 +8,14 @@ class ActiveStorage::Service::DiskServiceTest < ActiveSupport::TestCase include ActiveStorage::Service::SharedServiceTests test "URL generation" do - assert_match(/^https:\/\/example.com\/rails\/active_storage\/disk\/.*\/avatar\.png\?content_type=image%2Fpng&disposition=inline/, - @service.url(@key, expires_in: 5.minutes, disposition: :inline, filename: ActiveStorage::Filename.new("avatar.png"), content_type: "image/png")) + original_url_options = Rails.application.routes.default_url_options.dup + Rails.application.routes.default_url_options.merge!(protocol: "http", host: "test.example.com", port: 3001) + begin + assert_match(/^https:\/\/example.com\/rails\/active_storage\/disk\/.*\/avatar\.png\?content_type=image%2Fpng&disposition=inline/, + @service.url(@key, expires_in: 5.minutes, disposition: :inline, filename: ActiveStorage::Filename.new("avatar.png"), content_type: "image/png")) + ensure + Rails.application.routes.default_url_options = original_url_options + end end test "headers_for_direct_upload generation" do |