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

Fix NamespaceUploader.base_dir for remote uploads

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

1 files changed, 14 insertions, 0 deletions

diff --git a/spec/uploaders/namespace_file_uploader_spec.rb b/spec/uploaders/namespace_file_uploader_spec.rb
index 71fe2c353c0..eafbea07e10 100644
--- a/spec/uploaders/namespace_file_uploader_spec.rb
+++ b/spec/uploaders/namespace_file_uploader_spec.rb
@@ -26,6 +26,20 @@ describe NamespaceFileUploader do
                     upload_path: IDENTIFIER
   end
 
+  context '.base_dir' do
+    it 'returns local storage base_dir without store param' do
+      expect(described_class.base_dir(group)).to eq("uploads/-/system/namespace/#{group.id}")
+    end
+
+    it 'returns local storage base_dir when store param is Store::LOCAL' do
+      expect(described_class.base_dir(group, ObjectStorage::Store::LOCAL)).to eq("uploads/-/system/namespace/#{group.id}")
+    end
+
+    it 'returns remote base_dir when store param is Store::REMOTE' do
+      expect(described_class.base_dir(group, ObjectStorage::Store::REMOTE)).to eq("namespace/#{group.id}")
+    end
+  end
+
   describe "#migrate!" do
     before do
       uploader.store!(fixture_file_upload(File.join('spec/fixtures/doc_sample.txt')))