summaryrefslogtreecommitdiff
path: root/config/initializers/carrierwave.rb
diff options
context:
space:
mode:
authorMarin Jankovski <marin@gitlab.com>2014-04-24 13:23:17 +0200
committerMarin Jankovski <marin@gitlab.com>2014-04-24 13:23:17 +0200
commitfe1ca616017633a243017ad265c4713aca773ea3 (patch)
tree914f15f0854987053f09659787d51710286f5cdc /config/initializers/carrierwave.rb
parent1feaa336edf7a16ca39b036345890f05d35a1463 (diff)
downloadgitlab-ce-fe1ca616017633a243017ad265c4713aca773ea3.tar.gz
Make sure that tests pass when aws group is used.
Diffstat (limited to 'config/initializers/carrierwave.rb')
-rw-r--r--config/initializers/carrierwave.rb12
1 files changed, 12 insertions, 0 deletions
diff --git a/config/initializers/carrierwave.rb b/config/initializers/carrierwave.rb
index 6875fa74edd..d0065b63e54 100644
--- a/config/initializers/carrierwave.rb
+++ b/config/initializers/carrierwave.rb
@@ -18,4 +18,16 @@ if File.exists?(aws_file)
config.fog_authenticated_url_expiration = 1 << 29 # optional time (in seconds) that authenticated urls will be valid.
# when fog_public is false and provider is AWS or Google, defaults to 600
end
+
+ # Mocking Fog requests, based on: https://github.com/carrierwaveuploader/carrierwave/wiki/How-to%3A-Test-Fog-based-uploaders
+ if Rails.env.test?
+ Fog.mock!
+ connection = ::Fog::Storage.new(
+ :aws_access_key_id => AWS_CONFIG['access_key_id'],
+ :aws_secret_access_key => AWS_CONFIG['secret_access_key'],
+ :provider => 'AWS',
+ :region => AWS_CONFIG['region']
+ )
+ connection.directories.create(:key => AWS_CONFIG['bucket'])
+ end
end