Revert "Merge branch 'zj-improve-gitaly-pb' into 'master'"

This reverts merge request !23140

1 files changed, 18 insertions, 8 deletions

diff --git a/spec/lib/extracts_path_spec.rb b/spec/lib/extracts_path_spec.rb
index e0691aba600..8947e2ac4fb 100644
--- a/spec/lib/extracts_path_spec.rb
+++ b/spec/lib/extracts_path_spec.rb
@@ -205,18 +205,28 @@ describe ExtractsPath do
   end
 
   describe '#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' } }
+    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)
+      before do
+        @project = create(:project, :repository)
+      end
+
+      it 'handles annotated tags' do
+        assign_ref_vars
+
+        expect(lfs_blob_ids).to eq([])
+      end
     end
 
-    it 'handles annotated tags' do
-      assign_ref_vars
+    context 'when gitaly is enabled' do
+      it_behaves_like '#lfs_blob_ids'
+    end
 
-      expect(lfs_blob_ids).to eq([])
+    context 'when gitaly is disabled', :skip_gitaly_mock do
+      it_behaves_like '#lfs_blob_ids'
     end
   end
 end