From ff3dad07bacd4f41cb2d7857794acdff9c1c7ee2 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Tue, 1 Aug 2017 17:22:20 -0500 Subject: Skip if credentials aren't provided --- activestorage/test/controllers/direct_uploads_controller_test.rb | 2 +- activestorage/test/service/s3_service_test.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'activestorage/test') 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) -- cgit v1.2.3