From 2da0c0f5857a72c24e061bc57ca741f22262b1a2 Mon Sep 17 00:00:00 2001 From: Maxwell Salzberg Date: Thu, 29 Mar 2012 16:11:11 -0700 Subject: [PATCH] never use s3 in the test env ::sigh:: --- config/initializers/carrierwave.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/initializers/carrierwave.rb b/config/initializers/carrierwave.rb index 5afaacf8d..d712120dc 100644 --- a/config/initializers/carrierwave.rb +++ b/config/initializers/carrierwave.rb @@ -6,7 +6,7 @@ ENV["SSL_CERT_FILE"] = AppConfig[:ca_file] CarrierWave.configure do |config| - if AppConfig[:s3_key] && AppConfig[:s3_secret] && AppConfig[:s3_bucket] && AppConfig[:s3_region] + if !Rails.env.test? && AppConfig[:s3_key] && AppConfig[:s3_secret] && AppConfig[:s3_bucket] && AppConfig[:s3_region] config.storage = :s3 config.s3_access_key_id = AppConfig[:s3_key] config.s3_secret_access_key = AppConfig[:s3_secret]