Merge branch 'fix-elasticsearch-snippets' into 'master'

Search snippets via elasticsearch

Closes #10548

See merge request gitlab-org/gitlab-ee!10325

app/services/search/snippet_service.rb

@@ -19,3 +19,5 @@ module Search
     end
   end
 end
+
+Search::SnippetService.prepend(::EE::Search::SnippetService)

ee/app/services/ee/search/snippet_service.rb

+# frozen_string_literal: true
+
+module EE
+  module Search
+    module SnippetService
+      extend ::Gitlab::Utils::Override
+
+      override :execute
+
+      def execute
+        if ::Gitlab::CurrentSettings.elasticsearch_search?
+          ::Gitlab::Elastic::SnippetSearchResults.new(current_user, params[:search])
+        else
+          super
+        end
+      end
+    end
+  end
+end

ee/changelogs/unreleased/fix-elasticsearch-snippets.yml

+---
+title: Search snippets via elasticsearch
+merge_request: 10325
+author:
+type: fixed

ee/spec/services/search/global_service_spec.rb

+require 'spec_helper'
+
+describe Search::GlobalService do
+  let(:user) { create(:user) }
+
+  describe 'elasticsearch' do
+    before do
+      stub_ee_application_setting(elasticsearch_search: true, elasticsearch_indexing: true)
+    end
+
+    subject(:results) { described_class.new(user, search: '*').execute }
+
+    it { is_expected.to be_a(::Gitlab::Elastic::SearchResults) }
+  end
+end

ee/spec/services/search/group_service_spec.rb

@@ -54,4 +54,17 @@ describe Search::GroupService do
 
     include_examples 'group search'
   end
+
+  describe 'elasticsearch result' do
+    let(:user) { create(:user) }
+    let(:group) { create(:group) }
+
+    before do
+      stub_ee_application_setting(elasticsearch_search: true, elasticsearch_indexing: true)
+    end
+
+    subject(:results) { described_class.new(user, group, search: '*').execute }
+
+    it { is_expected.to be_a(::Gitlab::Elastic::GroupSearchResults) }
+  end
 end

ee/spec/services/search/project_service_spec.rb

+require 'spec_helper'
+
+describe Search::ProjectService do
+  let(:project) { create(:project) }
+  let(:user) { project.owner }
+
+  describe 'elasticsearch' do
+    before do
+      stub_ee_application_setting(elasticsearch_search: true, elasticsearch_indexing: true)
+    end
+
+    subject(:results) { described_class.new(project, user, search: '*').execute }
+
+    it { is_expected.to be_a(::Gitlab::Elastic::ProjectSearchResults) }
+  end
+end

ee/spec/services/search/snippet_service_spec.rb

+require 'spec_helper'
+
+describe Search::SnippetService do
+  let(:user) { create(:user) }
+
+  describe 'elasticsearch' do
+    before do
+      stub_ee_application_setting(elasticsearch_search: true, elasticsearch_indexing: true)
+    end
+
+    subject(:results) { described_class.new(user, search: '*').execute }
+
+    it { is_expected.to be_a(::Gitlab::Elastic::SnippetSearchResults) }
+  end
+end