Merge branch 'master' into axios-profileaxios-profile

1 files changed, 18 insertions, 0 deletions

diff --git a/spec/models/upload_spec.rb b/spec/models/upload_spec.rb
index 42f3d609770..36b8e5d304f 100644
--- a/spec/models/upload_spec.rb
+++ b/spec/models/upload_spec.rb
@@ -43,6 +43,18 @@ describe Upload do
           .to(a_string_matching(/\A\h{64}\z/))
       end
     end
+
+    describe 'after_destroy' do
+      context 'uploader is FileUploader-based' do
+        subject { create(:upload, :issuable_upload) }
+
+        it 'calls delete_file!' do
+          is_expected.to receive(:delete_file!)
+
+          subject.destroy
+        end
+      end
+    end
   end
 
   describe '#absolute_path' do
@@ -103,4 +115,10 @@ describe Upload do
       expect(upload).not_to exist
     end
   end
+
+  describe "#uploader_context" do
+    subject { create(:upload, :issuable_upload, secret: 'secret', filename: 'file.txt') }
+
+    it { expect(subject.uploader_context).to match(a_hash_including(secret: 'secret', identifier: 'file.txt')) }
+  end
 end