3 files changed, 59 insertions, 2 deletions
diff --git a/spec/models/commit_collection_spec.rb b/spec/models/commit_collection_spec.rb
index a8957bbfdd0..d49b71db5f8 100644
--- a/spec/models/commit_collection_spec.rb
+++ b/spec/models/commit_collection_spec.rb
@@ -149,6 +149,17 @@ describe CommitCollection do
 
         collection.enrich!
       end
+
+      it 'returns the original commit if the commit could not be lazy loaded' do
+        collection = described_class.new(project, [hash_commit])
+        unexisting_lazy_commit = Commit.lazy(project, Gitlab::Git::BLANK_SHA)
+
+        expect(Commit).to receive(:lazy).with(project, hash_commit.id).and_return(unexisting_lazy_commit)
+
+        collection.enrich!
+
+        expect(collection.commits).to contain_exactly(hash_commit)
+      end
     end
   end
 
diff --git a/spec/models/upload_spec.rb b/spec/models/upload_spec.rb
index d97bb8cfb90..03434c95218 100644
--- a/spec/models/upload_spec.rb
+++ b/spec/models/upload_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe Upload do
-  describe 'assocations' do
+  describe 'associations' do
     it { is_expected.to belong_to(:model) }
   end
 
@@ -107,6 +107,52 @@ describe Upload do
     end
   end
 
+  describe '#build_uploader' do
+    it 'returns a uploader object with current upload associated with it' do
+      subject = build(:upload)
+      uploader = subject.build_uploader
+
+      expect(uploader.upload).to eq(subject)
+      expect(uploader.mounted_as).to eq(subject.send(:mount_point))
+      expect(uploader.file).to be_nil
+    end
+  end
+
+  describe '#retrieve_uploader' do
+    it 'returns a uploader object with current uploader associated with and cache retrieved' do
+      subject = build(:upload)
+      uploader = subject.retrieve_uploader
+
+      expect(uploader.upload).to eq(subject)
+      expect(uploader.mounted_as).to eq(subject.send(:mount_point))
+      expect(uploader.file).not_to be_nil
+    end
+  end
+
+  describe '#needs_checksum?' do
+    context 'with local storage' do
+      it 'returns true when no checksum exists' do
+        subject = create(:upload, :with_file, checksum: nil)
+
+        expect(subject.needs_checksum?).to be_truthy
+      end
+
+      it 'returns false when checksum is already present' do
+        subject = create(:upload, :with_file, checksum: 'something')
+
+        expect(subject.needs_checksum?).to be_falsey
+      end
+    end
+
+    context 'with remote storage' do
+      subject { build(:upload, :object_storage) }
+
+      it 'returns false' do
+        expect(subject.needs_checksum?).to be_falsey
+      end
+    end
+  end
+
   describe '#exist?' do
     it 'returns true when the file exists' do
       upload = described_class.new(path: __FILE__, store: ObjectStorage::Store::LOCAL)
diff --git a/spec/models/uploads/fog_spec.rb b/spec/models/uploads/fog_spec.rb
index 4a44cf5ab0f..b93d9449da9 100644
--- a/spec/models/uploads/fog_spec.rb
+++ b/spec/models/uploads/fog_spec.rb
@@ -44,7 +44,7 @@ describe Uploads::Fog do
       subject { data_store.delete_keys(keys) }
 
       before do
-        uploads.each { |upload| upload.build_uploader.migrate!(2) }
+        uploads.each { |upload| upload.retrieve_uploader.migrate!(2) }
       end
 
       it 'deletes multiple data' do