diff options
| author | Andrew White <andrew.white@unboxed.co> | 2018-02-21 12:06:25 +0000 |
|---|---|---|
| committer | Andrew White <andrew.white@unboxed.co> | 2018-02-21 12:06:25 +0000 |
| commit | 7dce840deeed2e4655477acc9d7fc95dc8785c58 (patch) | |
| tree | e649e00024eb7d5ea9317ce7c6ea4e8258f46518 /activestorage/test | |
| parent | 4120074d3a5bd025b3c1e8e9e35fba76357d6388 (diff) | |
| download | rails-7dce840deeed2e4655477acc9d7fc95dc8785c58.tar.gz rails-7dce840deeed2e4655477acc9d7fc95dc8785c58.tar.bz2 rails-7dce840deeed2e4655477acc9d7fc95dc8785c58.zip | |
Allow S3 tests against buckets in other regions
Only us-east-1 gives URLs like bucket.s3.amazonaws.com whereas other
regions have URLs like s3-eu-west-1.amazonaws.com/ubxd-rails
Diffstat (limited to 'activestorage/test')
| -rw-r--r-- | activestorage/test/controllers/direct_uploads_controller_test.rb | 2 | ||||
| -rw-r--r-- | activestorage/test/service/s3_service_test.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/activestorage/test/controllers/direct_uploads_controller_test.rb b/activestorage/test/controllers/direct_uploads_controller_test.rb index 888767086c..dfffb6bb9c 100644 --- a/activestorage/test/controllers/direct_uploads_controller_test.rb +++ b/activestorage/test/controllers/direct_uploads_controller_test.rb @@ -27,7 +27,7 @@ if SERVICE_CONFIGURATIONS[:s3] && SERVICE_CONFIGURATIONS[:s3][:access_key_id].pr assert_equal checksum, details["checksum"] assert_equal "text/plain", details["content_type"] assert_match SERVICE_CONFIGURATIONS[:s3][:bucket], details["direct_upload"]["url"] - assert_match(/s3\.(\S+)?amazonaws\.com/, details["direct_upload"]["url"]) + assert_match(/s3(-[-a-z0-9]+)?\.(\S+)?amazonaws\.com/, details["direct_upload"]["url"]) assert_equal({ "Content-Type" => "text/plain", "Content-MD5" => checksum }, details["direct_upload"]["headers"]) end end diff --git a/activestorage/test/service/s3_service_test.rb b/activestorage/test/service/s3_service_test.rb index c3818422aa..d6996209d2 100644 --- a/activestorage/test/service/s3_service_test.rb +++ b/activestorage/test/service/s3_service_test.rb @@ -35,7 +35,7 @@ if SERVICE_CONFIGURATIONS[:s3] && SERVICE_CONFIGURATIONS[:s3][:access_key_id].pr url = @service.url(FIXTURE_KEY, expires_in: 5.minutes, disposition: :inline, filename: ActiveStorage::Filename.new("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(/s3(-[-a-z0-9]+)?\.(\S+)?amazonaws.com.*response-content-disposition=inline.*avatar\.png.*response-content-type=image%2Fpng/, url) assert_match SERVICE_CONFIGURATIONS[:s3][:bucket], url end |