diff options
author | David Heinemeier Hansson <david@loudthinking.com> | 2017-08-01 17:22:20 -0500 |
---|---|---|
committer | David Heinemeier Hansson <david@loudthinking.com> | 2017-08-01 17:22:20 -0500 |
commit | ff3dad07bacd4f41cb2d7857794acdff9c1c7ee2 (patch) | |
tree | 6531c0884343cfe16ce5e31abe1a75ae124d1e31 /activestorage/test | |
parent | 4f8be04f4e51c10fcaa0efd8eb004ea7860f1a56 (diff) | |
download | rails-ff3dad07bacd4f41cb2d7857794acdff9c1c7ee2.tar.gz rails-ff3dad07bacd4f41cb2d7857794acdff9c1c7ee2.tar.bz2 rails-ff3dad07bacd4f41cb2d7857794acdff9c1c7ee2.zip |
Skip if credentials aren't provided
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 7185bf2737..69d8ff2ab3 100644 --- a/activestorage/test/controllers/direct_uploads_controller_test.rb +++ b/activestorage/test/controllers/direct_uploads_controller_test.rb @@ -1,7 +1,7 @@ require "test_helper" require "database/setup" -if SERVICE_CONFIGURATIONS[:s3] +if SERVICE_CONFIGURATIONS[:s3] && SERVICE_CONFIGURATIONS[:s3][:access_key_id].present? class ActiveStorage::S3DirectUploadsControllerTest < ActionDispatch::IntegrationTest setup do @old_service = ActiveStorage::Blob.service diff --git a/activestorage/test/service/s3_service_test.rb b/activestorage/test/service/s3_service_test.rb index a8bec0736d..ae17eb32aa 100644 --- a/activestorage/test/service/s3_service_test.rb +++ b/activestorage/test/service/s3_service_test.rb @@ -1,7 +1,7 @@ require "service/shared_service_tests" require "net/http" -if SERVICE_CONFIGURATIONS[:s3] +if SERVICE_CONFIGURATIONS[:s3] && SERVICE_CONFIGURATIONS[:s3][:access_key_id].present? class ActiveStorage::Service::S3ServiceTest < ActiveSupport::TestCase SERVICE = ActiveStorage::Service.configure(:s3, SERVICE_CONFIGURATIONS) |