Merge branch 'tc-index-lfs-objects-file-store' into 'master'

Enhance performance of counting local LFS objects

Closes gitlab-ee#6067

See merge request gitlab-org/gitlab-ce!22143

1 files changed, 0 insertions, 19 deletions

diff --git a/spec/models/lfs_object_spec.rb b/spec/models/lfs_object_spec.rb
index 6e35511e848..911f85d7b28 100644
--- a/spec/models/lfs_object_spec.rb
+++ b/spec/models/lfs_object_spec.rb
@@ -2,12 +2,6 @@ require 'spec_helper'
 
 describe LfsObject do
   describe '#local_store?' do
-    it 'returns true when file_store is nil' do
-      subject.file_store = nil
-
-      expect(subject.local_store?).to eq true
-    end
-
     it 'returns true when file_store is equal to LfsObjectUploader::Store::LOCAL' do
       subject.file_store = LfsObjectUploader::Store::LOCAL
 
@@ -83,19 +77,6 @@ describe LfsObject do
     describe 'file is being stored' do
       let(:lfs_object) { create(:lfs_object, :with_file) }
 
-      context 'when object has nil store' do
-        before do
-          lfs_object.update_column(:file_store, nil)
-          lfs_object.reload
-        end
-
-        it 'is stored locally' do
-          expect(lfs_object.file_store).to be(nil)
-          expect(lfs_object.file).to be_file_storage
-          expect(lfs_object.file.object_store).to eq(ObjectStorage::Store::LOCAL)
-        end
-      end
-
       context 'when existing object has local store' do
         it 'is stored locally' do
           expect(lfs_object.file_store).to be(ObjectStorage::Store::LOCAL)