diff options
| author | James T. Perreault <james@perreau.lt> | 2017-07-17 10:17:33 -0400 |
|---|---|---|
| committer | George Claghorn <george.claghorn@gmail.com> | 2017-07-17 10:17:33 -0400 |
| commit | c8ad7dc13bbdc7b5c3305d5fd0a93f47d0f4baa4 (patch) | |
| tree | c1ce648641d278ad6d54d8f0f2006b0a18bba0b4 | |
| parent | bb7b8348e6f307fb9b7279bbab4ea19e9313a45e (diff) | |
| download | rails-c8ad7dc13bbdc7b5c3305d5fd0a93f47d0f4baa4.tar.gz rails-c8ad7dc13bbdc7b5c3305d5fd0a93f47d0f4baa4.tar.bz2 rails-c8ad7dc13bbdc7b5c3305d5fd0a93f47d0f4baa4.zip | |
Replace hard-coded S3 bucket name with configured bucket
| -rw-r--r-- | test/direct_uploads_controller_test.rb | 2 | ||||
| -rw-r--r-- | test/service/s3_service_test.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/test/direct_uploads_controller_test.rb b/test/direct_uploads_controller_test.rb index f96a37f758..8aa61f53cb 100644 --- a/test/direct_uploads_controller_test.rb +++ b/test/direct_uploads_controller_test.rb @@ -27,7 +27,7 @@ if SERVICE_CONFIGURATIONS[:s3] details = JSON.parse(@response.body) - assert_match /rails-activestorage\.s3.amazonaws\.com/, details["url"] + assert_match /#{SERVICE_CONFIGURATIONS[:s3][:bucket]}\.s3.(\S+)?amazonaws\.com/, details["url"] assert_equal "hello.txt", GlobalID::Locator.locate_signed(details["sgid"]).filename.to_s end end diff --git a/test/service/s3_service_test.rb b/test/service/s3_service_test.rb index d823e1fdca..6115cb8db0 100644 --- a/test/service/s3_service_test.rb +++ b/test/service/s3_service_test.rb @@ -27,7 +27,7 @@ if SERVICE_CONFIGURATIONS[:s3] end test "signed URL generation" do - assert_match /.+s3.+amazonaws.com.*response-content-disposition=inline.*avatar\.png/, + assert_match /#{SERVICE_CONFIGURATIONS[:s3][:bucket]}\.s3.(\S+)?amazonaws.com.*response-content-disposition=inline.*avatar\.png/, @service.url(FIXTURE_KEY, expires_in: 5.minutes, disposition: :inline, filename: "avatar.png") end end |