Merge branch 'fix-namespace-upload' into 'master'

Fix workhorse temp path for namespace uploads

Closes gitlab-ee#7009

See merge request gitlab-org/gitlab-ce!21650

1 files changed, 6 insertions, 0 deletions

diff --git a/spec/uploaders/namespace_file_uploader_spec.rb b/spec/uploaders/namespace_file_uploader_spec.rb
index eafbea07e10..799c6db57fa 100644
--- a/spec/uploaders/namespace_file_uploader_spec.rb
+++ b/spec/uploaders/namespace_file_uploader_spec.rb
@@ -40,6 +40,12 @@ describe NamespaceFileUploader do
     end
   end
 
+  describe '#workhorse_local_upload_path' do
+    it 'returns the correct path in uploads directory' do
+      expect(described_class.workhorse_local_upload_path).to end_with('/uploads/tmp/uploads')
+    end
+  end
+
   describe "#migrate!" do
     before do
       uploader.store!(fixture_file_upload(File.join('spec/fixtures/doc_sample.txt')))