Merge branch 'sh-fix-issue-47797-ce' into 'master'

Fix handling of annotated tags when Gitaly is not in use

Closes #47797

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

1 files changed, 26 insertions, 0 deletions

diff --git a/spec/lib/extracts_path_spec.rb b/spec/lib/extracts_path_spec.rb
index e13406d1972..8947e2ac4fb 100644
--- a/spec/lib/extracts_path_spec.rb
+++ b/spec/lib/extracts_path_spec.rb
@@ -203,4 +203,30 @@ describe ExtractsPath do
       expect(extract_ref_without_atom('foo.atom')).to eq(nil)
     end
   end
+
+  describe '#lfs_blob_ids' do
+    shared_examples '#lfs_blob_ids' do
+      let(:tag) { @project.repository.add_tag(@project.owner, 'my-annotated-tag', 'master', 'test tag') }
+      let(:ref) { tag.target }
+      let(:params) { { ref: ref, path: 'README.md' } }
+
+      before do
+        @project = create(:project, :repository)
+      end
+
+      it 'handles annotated tags' do
+        assign_ref_vars
+
+        expect(lfs_blob_ids).to eq([])
+      end
+    end
+
+    context 'when gitaly is enabled' do
+      it_behaves_like '#lfs_blob_ids'
+    end
+
+    context 'when gitaly is disabled', :skip_gitaly_mock do
+      it_behaves_like '#lfs_blob_ids'
+    end
+  end
 end