1 files changed, 9 insertions, 1 deletions
diff --git a/spec/uploaders/object_storage_spec.rb b/spec/uploaders/object_storage_spec.rb
index 9ce9a353913..6bad5d49b1c 100644
--- a/spec/uploaders/object_storage_spec.rb
+++ b/spec/uploaders/object_storage_spec.rb
@@ -12,7 +12,7 @@ class Implementation < GitlabUploader
 
   # user/:id
   def dynamic_segment
-    File.join(model.class.to_s.underscore, model.id.to_s)
+    File.join(model.class.underscore, model.id.to_s)
   end
 end
 
@@ -771,6 +771,14 @@ describe ObjectStorage do
           expect { avatars }.not_to exceed_query_limit(1)
         end
 
+        it 'does not attempt to replace methods' do
+          models.each do |model|
+            expect(model.avatar.upload).to receive(:method_missing).and_call_original
+
+            model.avatar.upload.path
+          end
+        end
+
         it 'fetches a unique upload for each model' do
           expect(avatars.map(&:url).uniq).to eq(avatars.map(&:url))
           expect(avatars.map(&:upload).uniq).to eq(avatars.map(&:upload))