aboutsummaryrefslogtreecommitdiffstats
path: root/activestorage/test/service/s3_service_test.rb
diff options
context:
space:
mode:
Diffstat (limited to 'activestorage/test/service/s3_service_test.rb')
-rw-r--r--activestorage/test/service/s3_service_test.rb7
1 files changed, 5 insertions, 2 deletions
diff --git a/activestorage/test/service/s3_service_test.rb b/activestorage/test/service/s3_service_test.rb
index ec80cbce61..6d613fd4fc 100644
--- a/activestorage/test/service/s3_service_test.rb
+++ b/activestorage/test/service/s3_service_test.rb
@@ -30,8 +30,11 @@ if SERVICE_CONFIGURATIONS[:s3] && SERVICE_CONFIGURATIONS[:s3][:access_key_id].pr
end
test "signed URL generation" do
- assert_match /#{SERVICE_CONFIGURATIONS[:s3][:bucket]}\.s3.(\S+)?amazonaws.com.*response-content-disposition=inline.*avatar\.png.*response-content-type=image%2Fpng/,
- @service.url(FIXTURE_KEY, expires_in: 5.minutes, disposition: :inline, filename: "avatar.png", content_type: "image/png")
+ url = @service.url(FIXTURE_KEY, expires_in: 5.minutes,
+ disposition: :inline, filename: "avatar.png", content_type: "image/png")
+
+ assert_match /s3\.(\S+)?amazonaws.com.*response-content-disposition=inline.*avatar\.png.*response-content-type=image%2Fpng/, url
+ assert_match SERVICE_CONFIGURATIONS[:s3][:bucket], url
end
test "uploading with server-side encryption" do