Use the Hashed Storage compatible layer to store Attachments

1 files changed, 39 insertions, 13 deletions

diff --git a/spec/uploaders/file_uploader_spec.rb b/spec/uploaders/file_uploader_spec.rb
index 2492d56a5cf..f52b2bab05b 100644
--- a/spec/uploaders/file_uploader_spec.rb
+++ b/spec/uploaders/file_uploader_spec.rb
@@ -3,25 +3,51 @@ require 'spec_helper'
 describe FileUploader do
   let(:uploader) { described_class.new(build_stubbed(:project)) }
 
-  describe '.absolute_path' do
-    it 'returns the correct absolute path by building it dynamically' do
-      project = build_stubbed(:project)
-      upload = double(model: project, path: 'secret/foo.jpg')
+  context 'legacy storage' do
+    let(:project) { build_stubbed(:project) }
 
-      dynamic_segment = project.path_with_namespace
+    describe '.absolute_path' do
+      it 'returns the correct absolute path by building it dynamically' do
+        upload = double(model: project, path: 'secret/foo.jpg')
 
-      expect(described_class.absolute_path(upload))
-        .to end_with("#{dynamic_segment}/secret/foo.jpg")
+        dynamic_segment = project.full_path
+
+        expect(described_class.absolute_path(upload))
+          .to end_with("#{dynamic_segment}/secret/foo.jpg")
+      end
+    end
+
+    describe "#store_dir" do
+      it "stores in the namespace path" do
+        uploader = described_class.new(project)
+
+        expect(uploader.store_dir).to include(project.full_path)
+        expect(uploader.store_dir).not_to include("system")
+      end
     end
   end
 
-  describe "#store_dir" do
-    it "stores in the namespace path" do
-      project = build_stubbed(:project)
-      uploader = described_class.new(project)
+  context 'hashed storage' do
+    let(:project) { build_stubbed(:project, :hashed) }
+
+    describe '.absolute_path' do
+      it 'returns the correct absolute path by building it dynamically' do
+        upload = double(model: project, path: 'secret/foo.jpg')
+
+        dynamic_segment = project.disk_path
+
+        expect(described_class.absolute_path(upload))
+          .to end_with("#{dynamic_segment}/secret/foo.jpg")
+      end
+    end
+
+    describe "#store_dir" do
+      it "stores in the namespace path" do
+        uploader = described_class.new(project)
 
-      expect(uploader.store_dir).to include(project.path_with_namespace)
-      expect(uploader.store_dir).not_to include("system")
+        expect(uploader.store_dir).to include(project.disk_path)
+        expect(uploader.store_dir).not_to include("system")
+      end
     end
   end