Add latest changes from gitlab-org/gitlab@master

1 files changed, 9 insertions, 1 deletions

diff --git a/spec/uploaders/file_uploader_spec.rb b/spec/uploaders/file_uploader_spec.rb
index 04206de3dc6..3c14edc7e0e 100644
--- a/spec/uploaders/file_uploader_spec.rb
+++ b/spec/uploaders/file_uploader_spec.rb
@@ -3,7 +3,7 @@ require 'spec_helper'
 describe FileUploader do
   let(:group) { create(:group, name: 'awesome') }
   let(:project) { create(:project, :legacy_storage, namespace: group, name: 'project') }
-  let(:uploader) { described_class.new(project) }
+  let(:uploader) { described_class.new(project, :avatar) }
   let(:upload) { double(model: project, path: 'secret/foo.jpg') }
 
   subject { uploader }
@@ -184,6 +184,14 @@ describe FileUploader do
     end
   end
 
+  describe '#replace_file_without_saving!' do
+    let(:replacement) { Tempfile.create('replacement.jpg') }
+
+    it 'replaces an existing file without changing its metadata' do
+      expect { subject.replace_file_without_saving! CarrierWave::SanitizedFile.new(replacement) }.not_to change { subject.upload }
+    end
+  end
+
   context 'when remote file is used' do
     let(:temp_file) { Tempfile.new("test") }