summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2017-02-28 13:33:47 -0500
committerRobert Speicher <rspeicher@gmail.com>2017-03-06 14:41:09 -0500
commitc4c2ac10d0997dd4e7bc958bca6052144a58839e (patch)
tree6f3ddc180df974507bd8ec8a96ca1ad6dfe3ad26
parent2cfb67dfef940ffeb8339ab980c0443624faf88f (diff)
downloadgitlab-ce-c4c2ac10d0997dd4e7bc958bca6052144a58839e.tar.gz
Change the default CarrierWave root path for tests
This more closely resembles the development and production paths in that paths contain `public/uploads`, rather than `uploads/uploads` as they did before.
-rw-r--r--spec/support/carrierwave.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/support/carrierwave.rb b/spec/support/carrierwave.rb
index fa9a316b6a2..b4b016e408f 100644
--- a/spec/support/carrierwave.rb
+++ b/spec/support/carrierwave.rb
@@ -1,4 +1,4 @@
-CarrierWave.root = File.expand_path('tmp/tests/uploads', Rails.root)
+CarrierWave.root = File.expand_path('tmp/tests/public', Rails.root)
RSpec.configure do |config|
config.after(:each) do