Merge branch 'gitaly-mandatory-20180627-jv' into 'master'

Make Gitaly search and message RPC's mandatory

Closes gitaly#1202, gitaly#1201, gitaly#1199, gitaly#1198, and gitaly#951

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

1 files changed, 2 insertions, 12 deletions

diff --git a/spec/models/repository_spec.rb b/spec/models/repository_spec.rb
index c7e751130d8..27a14ff5d5b 100644
--- a/spec/models/repository_spec.rb
+++ b/spec/models/repository_spec.rb
@@ -664,7 +664,7 @@ describe Repository do
     end
   end
 
-  shared_examples "search_files_by_content" do
+  describe "search_files_by_content" do
     let(:results) { repository.search_files_by_content('feature', 'master') }
     subject { results }
 
@@ -711,7 +711,7 @@ describe Repository do
     end
   end
 
-  shared_examples "search_files_by_name" do
+  describe "search_files_by_name" do
     let(:results) { repository.search_files_by_name('files', 'master') }
 
     it 'returns result' do
@@ -751,16 +751,6 @@ describe Repository do
     end
   end
 
-  describe 'with gitaly enabled' do
-    it_behaves_like 'search_files_by_content'
-    it_behaves_like 'search_files_by_name'
-  end
-
-  describe 'with gitaly disabled', :disable_gitaly do
-    it_behaves_like 'search_files_by_content'
-    it_behaves_like 'search_files_by_name'
-  end
-
   describe '#async_remove_remote' do
     before do
       masterrev = repository.find_branch('master').dereferenced_target