Merge branch '4986-isolate-elasticsearch-specs' into 'master'

Resolve "Isolate elasticsearch-using specs"

Closes #4986

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

.gitlab-ci.yml

@@ -77,19 +77,32 @@ stages:
     # (as many users are still using 9.2).
     - postgres:9.2
     - redis:alpine
-    - docker.elastic.co/elasticsearch/elasticsearch:5.5.2
 
-.use-pg-9-6-no-elasticsearch: &use-pg-9-6-no-elasticsearch
+.use-mysql: &use-mysql
+  services:
+    - mysql:latest
+    - redis:alpine
+
+# BEGIN EE-only service helpers
+
+.use-pg-9-6: &use-pg-9-6
   services:
     - postgres:9.6
     - redis:alpine
 
-.use-mysql: &use-mysql
+.use-pg-with-elasticsearch: &use-pg-with-elasticsearch
+  services:
+    - postgres:9.2
+    - redis:alpine
+    - docker.elastic.co/elasticsearch/elasticsearch:5.5.2
+
+.use-mysql-with-elasticsearch: &use-mysql-with-elasticsearch
   services:
     - mysql:latest
     - redis:alpine
     - docker.elastic.co/elasticsearch/elasticsearch:5.5.2
 
+# END EE-only service helpers
 
 # Skip all jobs except the ones that begin with 'docs/'.
 # Used for commits including ONLY documentation changes.
@@ -179,15 +192,15 @@ stages:
 
 .rspec-ee-pg: &rspec-ee-pg
   <<: *rspec-metadata-ee
-  <<: *use-pg
+  <<: *use-pg-with-elasticsearch
 
 .rspec-ee-mysql: &rspec-ee-mysql
   <<: *rspec-metadata-ee
-  <<: *use-mysql
+  <<: *use-mysql-with-elasticsearch
 
 .rspec-geo-pg-9-6: &rspec-metadata-pg-geo
   <<: *rspec-metadata
-  <<: *use-pg-9-6-no-elasticsearch
+  <<: *use-pg-9-6
   stage: test
   script:
     - export NO_KNAPSACK=1

ee/spec/features/search/elastic/project_search_spec.rb

+require 'spec_helper'
+
+describe 'Project elastic search', :js, :elastic do
+  let(:user) { create(:user) }
+  let(:project) { create(:project, :repository, namespace: user.namespace) }
+
+  before do
+    stub_ee_application_setting(elasticsearch_search: true, elasticsearch_indexing: true)
+
+    project.add_master(user)
+    sign_in(user)
+  end
+
+  describe 'searching' do
+    it 'finds issues' do
+      create(:issue, project: project, title: 'Test searching for an issue')
+
+      expect_search_result(scope: 'Issues', term: 'Test', result: 'Test searching for an issue')
+    end
+
+    it 'finds merge requests' do
+      create(:merge_request, source_project: project, target_project: project, title: 'Test searching for an MR')
+
+      expect_search_result(scope: 'Merge requests', term: 'Test', result: 'Test searching for an MR')
+    end
+
+    it 'finds milestones' do
+      create(:milestone, project: project, title: 'Test searching for a milestone')
+
+      expect_search_result(scope: 'Milestones', term: 'Test', result: 'Test searching for a milestone')
+    end
+
+    it 'finds wiki pages' do
+      project.wiki.create_page('test.md', 'Test searching for a wiki page')
+
+      expect_search_result(scope: 'Wiki', term: 'Test', result: 'Test searching for a wiki page')
+    end
+
+    it 'finds notes' do
+      create(:note, project: project, note: 'Test searching for a note')
+
+      search(scope: 'Comments', term: 'Test')
+
+      expect(page).to have_content(/showing (\d+) - (\d+) of (\d+) notes/i)
+      expect(page).to have_content('Test searching for a note')
+    end
+
+    it 'finds commits' do
+      project.repository.index_commits
+
+      search(scope: 'Commits', term: 'initial')
+
+      expect(page).to have_content(/showing (\d+) - (\d+) of (\d+) commits/i)
+      expect(page).to have_content('Initial commit')
+    end
+
+    it 'finds blobs' do
+      project.repository.index_blobs
+
+      search(scope: 'Code', term: 'def')
+
+      expect(page).to have_content(/showing (\d+) - (\d+) of (\d+) blobs/i)
+      expect(page).to have_content('def username_regex')
+    end
+  end
+
+  def search(scope:, term:)
+    visit project_path(project)
+
+    fill_in('search', with: term)
+    find('#search').native.send_keys(:enter)
+
+    page.within '.search-filter' do
+      click_link scope
+    end
+  end
+
+  def expect_search_result(scope:, term:, result:)
+    search(scope: scope, term: term)
+
+    expect(page).to have_content(/showing (\d+) - (\d+) of (\d+) #{Regexp.escape(scope)}/i)
+    expect(page).to have_content(result)
+  end
+end

ee/spec/features/search/elastic/snippet_search_spec.rb

+require 'spec_helper'
+
+describe 'Snippet elastic search', :js, :elastic do
+  let(:user) { create(:user) }
+  let(:project) { create(:project, namespace: user.namespace) }
+
+  before do
+    stub_ee_application_setting(elasticsearch_search: true, elasticsearch_indexing: true)
+
+    project.add_master(user)
+    sign_in(user)
+  end
+
+  describe 'searching' do
+    it 'finds a personal snippet' do
+      create(:personal_snippet, author: user, content: 'Test searching for personal snippets')
+
+      visit explore_snippets_path
+      fill_in 'search', with: 'Test'
+      click_button 'Go'
+
+      expect(page).to have_content('Test searching for personal snippets')
+    end
+
+    it 'finds a project snippet' do
+      create(:project_snippet, project: project, content: 'Test searching for personal snippets')
+
+      visit explore_snippets_path
+      fill_in 'search', with: 'Test'
+      click_button 'Go'
+
+      expect(page).to have_content('Test searching for personal snippets')
+    end
+  end
+end

ee/spec/helpers/search_helper_spec.rb

+require 'spec_helper'
+
+describe SearchHelper do
+  describe '#parse_search_result_from_elastic' do
+    before do
+      stub_ee_application_setting(elasticsearch_search: true, elasticsearch_indexing: true)
+      Gitlab::Elastic::Helper.create_empty_index
+    end
+
+    after do
+      Gitlab::Elastic::Helper.delete_index
+      stub_ee_application_setting(elasticsearch_search: false, elasticsearch_indexing: false)
+    end
+
+    it "returns parsed result" do
+      project = create :project, :repository
+
+      project.repository.index_blobs
+
+      Gitlab::Elastic::Helper.refresh_index
+
+      result = project.repository.search(
+        'def popen',
+        type: :blob,
+        options: { highlight: true }
+      )[:blobs][:results][0]
+
+      parsed_result = helper.parse_search_result(result)
+
+      expect(parsed_result.ref). to eq('b83d6e391c22777fca1ed3012fce84f633d7fed0')
+      expect(parsed_result.filename).to eq('files/ruby/popen.rb')
+      expect(parsed_result.startline).to eq(2)
+      expect(parsed_result.data).to include("Popen")
+    end
+  end
+end

ee/spec/models/concerns/elastic/issue_spec.rb

 require 'spec_helper'
 
-describe Issue, elastic: true do
+describe Issue, :elastic do
   before do
     stub_ee_application_setting(elasticsearch_search: true, elasticsearch_indexing: true)
-    Gitlab::Elastic::Helper.create_empty_index
-  end
-
-  after do
-    Gitlab::Elastic::Helper.delete_index
-    stub_ee_application_setting(elasticsearch_search: false, elasticsearch_indexing: false)
   end
 
   let(:project) { create :project }

ee/spec/models/concerns/elastic/merge_request_spec.rb

 require 'spec_helper'
 
-describe MergeRequest, elastic: true do
+describe MergeRequest, :elastic do
   before do
     stub_ee_application_setting(elasticsearch_search: true, elasticsearch_indexing: true)
-    Gitlab::Elastic::Helper.create_empty_index
-  end
-
-  after do
-    Gitlab::Elastic::Helper.delete_index
-    stub_ee_application_setting(elasticsearch_search: false, elasticsearch_indexing: false)
   end
 
   it "searches merge requests" do

ee/spec/models/concerns/elastic/milestone_spec.rb

 require 'spec_helper'
 
-describe Milestone, elastic: true do
+describe Milestone, :elastic do
   before do
     stub_ee_application_setting(elasticsearch_search: true, elasticsearch_indexing: true)
-    Gitlab::Elastic::Helper.create_empty_index
-  end
-
-  after do
-    Gitlab::Elastic::Helper.delete_index
-    stub_ee_application_setting(elasticsearch_search: false, elasticsearch_indexing: false)
   end
 
   it "searches milestones" do

ee/spec/models/concerns/elastic/note_spec.rb

 require 'spec_helper'
 
-describe Note, elastic: true do
+describe Note, :elastic do
   before do
     stub_ee_application_setting(elasticsearch_search: true, elasticsearch_indexing: true)
-    Gitlab::Elastic::Helper.create_empty_index
-  end
-
-  after do
-    Gitlab::Elastic::Helper.delete_index
-    stub_ee_application_setting(elasticsearch_search: false, elasticsearch_indexing: false)
   end
 
   it "searches notes" do

ee/spec/models/concerns/elastic/project_spec.rb

 require 'spec_helper'
 
-describe Project, elastic: true do
+describe Project, :elastic do
   before do
     stub_ee_application_setting(elasticsearch_search: true, elasticsearch_indexing: true)
-    Gitlab::Elastic::Helper.create_empty_index
-  end
-
-  after do
-    Gitlab::Elastic::Helper.delete_index
-    stub_ee_application_setting(elasticsearch_search: false, elasticsearch_indexing: false)
   end
 
   it "finds projects" do

ee/spec/models/concerns/elastic/project_wiki_spec.rb

 require 'spec_helper'
 
-describe ProjectWiki, elastic: true do
+describe ProjectWiki, :elastic do
   before do
     stub_ee_application_setting(elasticsearch_search: true, elasticsearch_indexing: true)
-    Gitlab::Elastic::Helper.create_empty_index
-  end
-
-  after do
-    Gitlab::Elastic::Helper.delete_index
-    stub_ee_application_setting(elasticsearch_search: false, elasticsearch_indexing: false)
   end
 
   it "searches wiki page" do

ee/spec/models/concerns/elastic/repository_spec.rb

 require 'spec_helper'
 
-describe Repository, elastic: true do
+describe Repository, :elastic do
   before do
     stub_ee_application_setting(elasticsearch_search: true, elasticsearch_indexing: true)
-    Gitlab::Elastic::Helper.create_empty_index
-  end
-
-  after do
-    Gitlab::Elastic::Helper.delete_index
-    stub_ee_application_setting(elasticsearch_search: false, elasticsearch_indexing: false)
   end
 
   def index!(project)

ee/spec/models/concerns/elastic/snippet_spec.rb

 require 'spec_helper'
 
-describe Snippet, elastic: true do
+describe Snippet, :elastic do
   before do
     stub_ee_application_setting(elasticsearch_search: true, elasticsearch_indexing: true)
-    Gitlab::Elastic::Helper.create_empty_index
-  end
-
-  after do
-    Gitlab::Elastic::Helper.delete_index
-    stub_ee_application_setting(elasticsearch_search: false, elasticsearch_indexing: false)
   end
 
   context 'searching snippets by code' do

ee/spec/models/project_spec.rb

@@ -1312,4 +1312,48 @@ describe Project do
       expect(project.user_can_push_to_empty_repo?(user)).to be_falsey
     end
   end
+
+  describe 'project import state transitions' do
+    context 'state transition: [:started] => [:finished]' do
+      context 'elasticsearch indexing disabled' do
+        before do
+          stub_ee_application_setting(elasticsearch_indexing: false)
+        end
+
+        it 'does not index the repository' do
+          project = create(:project, :import_started, import_type: :github)
+
+          expect(ElasticCommitIndexerWorker).not_to receive(:perform_async)
+
+          project.import_finish
+        end
+      end
+
+      context 'elasticsearch indexing enabled' do
+        let(:project) { create(:project, :import_started, import_type: :github) }
+
+        before do
+          stub_ee_application_setting(elasticsearch_indexing: true)
+        end
+
+        context 'no index status' do
+          it 'schedules a full index of the repository' do
+            expect(ElasticCommitIndexerWorker).to receive(:perform_async).with(project.id, nil)
+
+            project.import_finish
+          end
+        end
+
+        context 'with index status' do
+          let!(:index_status) { project.create_index_status!(indexed_at: Time.now, last_commit: 'foo') }
+
+          it 'schedules a progressive index of the repository' do
+            expect(ElasticCommitIndexerWorker).to receive(:perform_async).with(project.id, index_status.last_commit)
+
+            project.import_finish
+          end
+        end
+      end
+    end
+  end
 end

ee/spec/models/repository_spec.rb

@@ -26,4 +26,40 @@ describe Repository do
       repository.after_sync
     end
   end
+
+  describe "Elastic search", :elastic do
+    before do
+      stub_ee_application_setting(elasticsearch_search: true, elasticsearch_indexing: true)
+    end
+
+    describe "class method find_commits_by_message_with_elastic" do
+      it "returns commits" do
+        project = create :project, :repository
+        project1 = create :project, :repository
+
+        project.repository.index_commits
+        project1.repository.index_commits
+
+        Gitlab::Elastic::Helper.refresh_index
+
+        expect(described_class.find_commits_by_message_with_elastic('initial').first).to be_a(Commit)
+        expect(described_class.find_commits_by_message_with_elastic('initial').count).to eq(2)
+        expect(described_class.find_commits_by_message_with_elastic('initial').total_count).to eq(2)
+      end
+    end
+
+    describe "find_commits_by_message_with_elastic" do
+      it "returns commits" do
+        project = create :project, :repository
+
+        project.repository.index_commits
+
+        Gitlab::Elastic::Helper.refresh_index
+
+        expect(project.repository.find_commits_by_message_with_elastic('initial').first).to be_a(Commit)
+        expect(project.repository.find_commits_by_message_with_elastic('initial').count).to eq(1)
+        expect(project.repository.find_commits_by_message_with_elastic('initial').total_count).to eq(1)
+      end
+    end
+  end
 end

ee/spec/requests/api/search_spec.rb

+require 'spec_helper'
+
+describe API::Search do
+  set(:user) { create(:user) }
+  set(:group) { create(:group) }
+  let(:project) { create(:project, :public, name: 'awesome project', group: group) }
+  let(:repo_project) { create(:project, :public, :repository, group: group) }
+
+  shared_examples 'response is correct' do |schema:, size: 1|
+    it { expect(response).to have_gitlab_http_status(200) }
+    it { expect(response).to match_response_schema(schema) }
+    it { expect(response).to include_limited_pagination_headers }
+    it { expect(json_response.size).to eq(size) }
+  end
+
+  shared_examples 'elasticsearch disabled' do
+    it 'returns 400 error for wiki_blobs scope' do
+      get api(endpoint, user), scope: 'wiki_blobs', search: 'awesome'
+
+      expect(response).to have_gitlab_http_status(400)
+    end
+
+    it 'returns 400 error for blobs scope' do
+      get api(endpoint, user), scope: 'blobs', search: 'monitors'
+
+      expect(response).to have_gitlab_http_status(400)
+    end
+
+    it 'returns 400 error for commits scope' do
+      get api(endpoint, user), scope: 'commits', search: 'folder'
+
+      expect(response).to have_gitlab_http_status(400)
+    end
+  end
+
+  shared_examples 'elasticsearch enabled' do
+    before do
+      stub_ee_application_setting(elasticsearch_search: true, elasticsearch_indexing: true)
+      Gitlab::Elastic::Helper.create_empty_index
+    end
+
+    after do
+      Gitlab::Elastic::Helper.delete_index
+      stub_ee_application_setting(elasticsearch_search: false, elasticsearch_indexing: false)
+    end
+
+    context 'for wiki_blobs scope' do
+      before do
+        wiki = create(:project_wiki, project: project)
+        create(:wiki_page, wiki: wiki, attrs: { title: 'home', content: "Awesome page" })
+
+        project.wiki.index_blobs
+        Gitlab::Elastic::Helper.refresh_index
+
+        get api(endpoint, user), scope: 'wiki_blobs', search: 'awesome'
+      end
+
+      it_behaves_like 'response is correct', schema: 'public_api/v4/blobs'
+    end
+
+    context 'for commits scope' do
+      before do
+        repo_project.repository.index_commits
+        Gitlab::Elastic::Helper.refresh_index
+
+        get api(endpoint, user), scope: 'commits', search: 'folder'
+      end
+
+      it_behaves_like 'response is correct', schema: 'public_api/v4/commits_details', size: 2
+    end
+
+    context 'for blobs scope' do
+      before do
+        repo_project.repository.index_blobs
+        Gitlab::Elastic::Helper.refresh_index
+
+        get api(endpoint, user), scope: 'blobs', search: 'monitors'
+      end
+
+      it_behaves_like 'response is correct', schema: 'public_api/v4/blobs'
+    end
+  end
+
+  describe 'GET /search' do
+    context 'with correct params' do
+      context 'when elasticsearch is disabled' do
+        it_behaves_like 'elasticsearch disabled' do
+          let(:endpoint) { '/search' }
+        end
+      end
+
+      context 'when elasticsearch is enabled' do
+        it_behaves_like 'elasticsearch enabled' do
+          let(:endpoint) { '/search' }
+        end
+      end
+    end
+  end
+
+  describe "GET /groups/:id/-/search" do
+    context 'with correct params' do
+      context 'when elasticsearch is disabled' do
+        it_behaves_like 'elasticsearch disabled' do
+          let(:endpoint) { "/groups/#{group.id}/-/search" }
+        end
+      end
+
+      context 'when elasticsearch is enabled' do
+        it_behaves_like 'elasticsearch enabled' do
+          let(:endpoint) { "/groups/#{group.id}/-/search" }
+        end
+      end
+    end
+  end
+end

ee/spec/services/search/group_service_spec.rb

+require 'spec_helper'
+
+describe Search::GroupService do
+  shared_examples_for 'group search' do
+    context 'finding projects by name' do
+      let(:user) { create(:user) }
+      let(:term) { "Project Name" }
+      let(:nested_group) { create(:group, :nested) }
+
+      # These projects shouldn't be found
+      let!(:outside_project) { create(:project, :public, name: "Outside #{term}") }
+      let!(:private_project) { create(:project, :private, namespace: nested_group, name: "Private #{term}" )}
+      let!(:other_project)   { create(:project, :public, namespace: nested_group, name: term.reverse) }
+
+      # These projects should be found
+      let!(:project1) { create(:project, :internal, namespace: nested_group, name: "Inner #{term} 1") }
+      let!(:project2) { create(:project, :internal, namespace: nested_group, name: "Inner #{term} 2") }
+      let!(:project3) { create(:project, :internal, namespace: nested_group.parent, name: "Outer #{term}") }
+
+      let(:results) { described_class.new(user, search_group, search: term).execute }
+      subject { results.objects('projects') }
+
+      context 'in parent group' do
+        let(:search_group) { nested_group.parent }
+
+        it { is_expected.to match_array([project1, project2, project3]) }
+      end
+
+      context 'in subgroup' do
+        let(:search_group) { nested_group }
+
+        it { is_expected.to match_array([project1, project2]) }
+      end
+    end
+  end
+
+  describe 'elasticsearch' do
+    before do
+      stub_ee_application_setting(elasticsearch_search: true, elasticsearch_indexing: true)
+      Gitlab::Elastic::Helper.create_empty_index
+
+      # Ensure these are present when the index is refreshed
+      _ = [
+        outside_project, private_project, other_project,
+        project1, project2, project3
+      ]
+
+      Gitlab::Elastic::Helper.refresh_index
+    end
+
+    after do
+      Gitlab::Elastic::Helper.delete_index
+    end
+
+    include_examples 'group search'
+  end
+end

ee/spec/support/elastic.rb

+RSpec.configure do |config|
+  config.before(:each, :elastic) do
+    Gitlab::Elastic::Helper.create_empty_index
+  end
+
+  config.after(:each, :elastic) do
+    Gitlab::Elastic::Helper.delete_index
+  end
+end

ee/spec/workers/elastic_indexer_worker_spec.rb

 require 'spec_helper'
 
-describe ElasticIndexerWorker, elastic: true do
+describe ElasticIndexerWorker, :elastic do
   subject { described_class.new }
 
   before do
@@ -8,12 +8,6 @@ describe ElasticIndexerWorker, elastic: true do
 
     Elasticsearch::Model.client =
       Gitlab::Elastic::Client.build(Gitlab::CurrentSettings.elasticsearch_config)
-
-    Gitlab::Elastic::Helper.create_empty_index
-  end
-
-  after do
-    Gitlab::Elastic::Helper.delete_index
   end
 
   it 'returns true if ES disabled' do

features/project/elastic/global_search.feature

-Feature: Global Search
-  Background:
-    Given I sign in as a user
-    And I own project "Shop"
-    And Elasticsearch is enabled
-
-  Scenario: I search through the all projects
-    Given project has all data available for the search
-    And I visit dashboard page
-    Then I search "initial"
-    And I find an Issue
-    And I find a Merge Request
-    And I find a Milestone
\ No newline at end of file

features/project/elastic/project_search.feature

-Feature: Project Search
-  Background:
-    Given I sign in as a user
-    And I own project "Shop"
-    And Elasticsearch is enabled
-
-  Scenario: I search through the all project items
-    Given project has all data available for the search
-    And I visit my project's home page
-    Then I search "initial"
-    And I find an Issue
-    And I find a Merge Request
-    And I find a Milestone
-    And I find a Comment
-    And I find a Commit
-    And I find a Wiki Page
-    Then I visit my project's home page
-    Then I search "def"
-    And I find a Code

features/project/elastic/snippets_search.feature

-Feature: Snippets Search
-  Background:
-    Given I sign in as a user
-    And Elasticsearch is enabled
-
-  Scenario: I search through the snippets
-    Given there is a snippet "index" with "php rocks" string
-    And there is a snippet "php" with "benefits" string
-    And I visit snippets page
-    Then I search "php"
-    And I find "index" snippet
-    Then I select search by titles and filenames
-    And I find "php" snippet
\ No newline at end of file

features/steps/project/elastic/global_search.rb

-require_dependency Rails.root.join('spec', 'support', 'stub_configuration')
-
-class Spinach::Features::GlobalSearch < Spinach::FeatureSteps
-  include SharedAuthentication
-  include SharedPaths
-  include SharedProject
-  include SharedElastic
-  include StubConfiguration
-
-  before do
-    stub_ee_application_setting(elasticsearch_search: true, elasticsearch_indexing: true)
-
-    Gitlab::Elastic::Helper.create_empty_index
-  end
-
-  after do
-    Gitlab::Elastic::Helper.delete_index
-
-    stub_ee_application_setting(elasticsearch_search: false, elasticsearch_indexing: false)
-  end
-
-  step 'project has all data available for the search' do
-    @project = create :project
-    @project.add_master(current_user)
-
-    @issue = create :issue, title: 'bla-bla initial', project: @project
-    @merge_request = create :merge_request, title: 'bla-bla initial', source_project: @project
-    @milestone = create :milestone, title: 'bla-bla initial', project: @project
-  end
-end

features/steps/project/elastic/project_search.rb

-class Spinach::Features::ProjectSearch < Spinach::FeatureSteps
-  include SharedAuthentication
-  include SharedPaths
-  include SharedProject
-  include SharedElastic
-  include StubConfiguration
-
-  before do
-    stub_ee_application_setting(elasticsearch_search: true, elasticsearch_indexing: true)
-
-    Gitlab::Elastic::Helper.create_empty_index
-  end
-
-  after do
-    Gitlab::Elastic::Helper.delete_index
-
-    stub_ee_application_setting(elasticsearch_search: false, elasticsearch_indexing: false)
-  end
-
-  step 'project has all data available for the search' do
-    @project = create :project, :repository
-    @project.add_master(current_user)
-
-    @issue = create :issue, title: 'bla-bla initial', project: @project
-    @merge_request = create :merge_request, title: 'bla-bla initial', source_project: @project
-    @milestone = create :milestone, title: 'bla-bla initial', project: @project
-    @note = create :note, note: 'bla-bla initial', project: @project, noteable: @issue
-
-    @project.repository.index_blobs
-    @project.repository.index_commits
-
-    @project.wiki.create_page("index_page", "Bla bla initial")
-  end
-
-  step 'I search "def"' do
-    fill_in "search", with: "def"
-    click_button "Go"
-  end
-
-  step 'I find a Comment' do
-    select_filter("Comments")
-
-    expect(page.find('.search-result-row')).to have_content(@note.note)
-  end
-
-  step 'I find a Wiki Page' do
-    select_filter("Wiki")
-
-    expect(page.find('.blob-result')).to have_content('Bla bla init')
-  end
-
-  step 'I find a Commit' do
-    select_filter("Commits")
-
-    expect(page.find('.commit-content .item-title')).to have_content("Initial commit")
-  end
-
-  step 'I find a Code' do
-    expect(page.first('.blob-result')).to have_content("def")
-  end
-end

features/steps/project/elastic/snippets_search.rb

-class Spinach::Features::SnippetsSearch < Spinach::FeatureSteps
-  include SharedAuthentication
-  include SharedPaths
-  include SharedProject
-  include SharedElastic
-  include StubConfiguration
-
-  before do
-    stub_ee_application_setting(elasticsearch_search: true, elasticsearch_indexing: true)
-
-    Gitlab::Elastic::Helper.create_empty_index
-  end
-
-  after do
-    Gitlab::Elastic::Helper.delete_index
-
-    stub_ee_application_setting(elasticsearch_search: false, elasticsearch_indexing: false)
-  end
-
-  step 'there is a snippet "index" with "php rocks" string' do
-    create :personal_snippet, :public, content: "php rocks", title: "index"
-    Gitlab::Elastic::Helper.refresh_index
-  end
-
-  step 'there is a snippet "php" with "benefits" string' do
-    create :personal_snippet, :public, content: "benefits", title: "php"
-    Gitlab::Elastic::Helper.refresh_index
-  end
-
-  step 'I search "php"' do
-    fill_in "search", with: "php"
-    click_button "Go"
-  end
-
-  step 'I find "index" snippet' do
-    expect(page.find('.file-holder')).to have_content("php rocks")
-  end
-
-  step 'I select search by titles and filenames' do
-    select_filter("Titles and Filenames")
-  end
-
-  step 'I find "php" snippet' do
-    expect(page.find('.search-result-row')).to have_content("php")
-  end
-end

features/steps/shared/elastic.rb

-module SharedElastic
-  include Spinach::DSL
-
-  step 'I search "initial"' do
-    fill_in "search", with: "initial"
-    click_button "Go"
-  end
-
-  step 'I find an Issue' do
-    select_filter("Issues")
-
-    expect(page.find('.search-result-row')).to have_content(@issue.title)
-  end
-
-  step 'I find a Merge Request' do
-    select_filter("Merge requests")
-
-    expect(page.find('.search-result-row')).to have_content(@merge_request.title)
-  end
-
-  step 'I find a Milestone' do
-    select_filter("Milestones")
-
-    expect(page.find('.search-result-row')).to have_content(@milestone.title)
-  end
-
-  step 'Elasticsearch is enabled' do
-    stub_ee_application_setting(elasticsearch_search: true, elasticsearch_indexing: true)
-  end
-
-  def select_filter(name)
-    find(:xpath, "//ul[contains(@class, 'search-filter')]//a[contains(.,'#{name}')]").click
-  end
-end

spec/helpers/search_helper_spec.rb

@@ -6,39 +6,6 @@ describe SearchHelper do
     str
   end
 
-  describe '#parse_search_result_from_elastic' do
-    before do
-      stub_ee_application_setting(elasticsearch_search: true, elasticsearch_indexing: true)
-      Gitlab::Elastic::Helper.create_empty_index
-    end
-
-    after do
-      Gitlab::Elastic::Helper.delete_index
-      stub_ee_application_setting(elasticsearch_search: false, elasticsearch_indexing: false)
-    end
-
-    it "returns parsed result" do
-      project = create :project, :repository
-
-      project.repository.index_blobs
-
-      Gitlab::Elastic::Helper.refresh_index
-
-      result = project.repository.search(
-        'def popen',
-        type: :blob,
-        options: { highlight: true }
-      )[:blobs][:results][0]
-
-      parsed_result = helper.parse_search_result(result)
-
-      expect(parsed_result.ref). to eq('b83d6e391c22777fca1ed3012fce84f633d7fed0')
-      expect(parsed_result.filename).to eq('files/ruby/popen.rb')
-      expect(parsed_result.startline).to eq(2)
-      expect(parsed_result.data).to include("Popen")
-    end
-  end
-
   describe 'search_autocomplete_source' do
     context "with no current user" do
       before do

spec/models/project_spec.rb

@@ -1846,46 +1846,6 @@ describe Project do
 
         expect(housekeeping_service).not_to have_received(:execute)
       end
-
-      context 'elasticsearch indexing disabled' do
-        before do
-          stub_ee_application_setting(elasticsearch_indexing: false)
-        end
-
-        it 'does not index the repository' do
-          project = create(:project, :import_started, import_type: :github)
-
-          expect(ElasticCommitIndexerWorker).not_to receive(:perform_async)
-
-          project.import_finish
-        end
-      end
-
-      context 'elasticsearch indexing enabled' do
-        let(:project) { create(:project, :import_started, import_type: :github) }
-
-        before do
-          stub_ee_application_setting(elasticsearch_indexing: true)
-        end
-
-        context 'no index status' do
-          it 'schedules a full index of the repository' do
-            expect(ElasticCommitIndexerWorker).to receive(:perform_async).with(project.id, nil)
-
-            project.import_finish
-          end
-        end
-
-        context 'with index status' do
-          let!(:index_status) { project.create_index_status!(indexed_at: Time.now, last_commit: 'foo') }
-
-          it 'schedules a progressive index of the repository' do
-            expect(ElasticCommitIndexerWorker).to receive(:perform_async).with(project.id, index_status.last_commit)
-
-            project.import_finish
-          end
-        end
-      end
     end
   end
 

spec/models/repository_spec.rb

@@ -1813,48 +1813,6 @@ describe Repository do
     end
   end
 
-  describe "Elastic search", :elastic do
-    before do
-      stub_ee_application_setting(elasticsearch_search: true, elasticsearch_indexing: true)
-      Gitlab::Elastic::Helper.create_empty_index
-    end
-
-    after do
-      Gitlab::Elastic::Helper.delete_index
-      stub_ee_application_setting(elasticsearch_search: false, elasticsearch_indexing: false)
-    end
-
-    describe "class method find_commits_by_message_with_elastic" do
-      it "returns commits" do
-        project = create :project, :repository
-        project1 = create :project, :repository
-
-        project.repository.index_commits
-        project1.repository.index_commits
-
-        Gitlab::Elastic::Helper.refresh_index
-
-        expect(described_class.find_commits_by_message_with_elastic('initial').first).to be_a(Commit)
-        expect(described_class.find_commits_by_message_with_elastic('initial').count).to eq(2)
-        expect(described_class.find_commits_by_message_with_elastic('initial').total_count).to eq(2)
-      end
-    end
-
-    describe "find_commits_by_message_with_elastic" do
-      it "returns commits" do
-        project = create :project, :repository
-
-        project.repository.index_commits
-
-        Gitlab::Elastic::Helper.refresh_index
-
-        expect(project.repository.find_commits_by_message_with_elastic('initial').first).to be_a(Commit)
-        expect(project.repository.find_commits_by_message_with_elastic('initial').count).to eq(1)
-        expect(project.repository.find_commits_by_message_with_elastic('initial').total_count).to eq(1)
-      end
-    end
-  end
-
   describe '#after_create' do
     it 'flushes the exists cache' do
       expect(repository).to receive(:expire_exists_cache)

spec/requests/api/search_spec.rb

@@ -3,8 +3,8 @@ require 'spec_helper'
 describe API::Search do
   set(:user) { create(:user) }
   set(:group) { create(:group) }
-  let(:project) { create(:project, :public, name: 'awesome project', group: group) }
-  let(:repo_project) { create(:project, :public, :repository, group: group) }
+  set(:project) { create(:project, :public, name: 'awesome project', group: group) }
+  set(:repo_project) { create(:project, :public, :repository, group: group) }
 
   shared_examples 'response is correct' do |schema:, size: 1|
     it { expect(response).to have_gitlab_http_status(200) }
@@ -13,74 +13,6 @@ describe API::Search do
     it { expect(json_response.size).to eq(size) }
   end
 
-  shared_examples 'elasticsearch disabled' do
-    it 'returns 400 error for wiki_blobs scope' do
-      get api(endpoint, user), scope: 'wiki_blobs', search: 'awesome'
-
-      expect(response).to have_gitlab_http_status(400)
-    end
-
-    it 'returns 400 error for blobs scope' do
-      get api(endpoint, user), scope: 'blobs', search: 'monitors'
-
-      expect(response).to have_gitlab_http_status(400)
-    end
-
-    it 'returns 400 error for commits scope' do
-      get api(endpoint, user), scope: 'commits', search: 'folder'
-
-      expect(response).to have_gitlab_http_status(400)
-    end
-  end
-
-  shared_examples 'elasticsearch enabled' do
-    before do
-      stub_ee_application_setting(elasticsearch_search: true, elasticsearch_indexing: true)
-      Gitlab::Elastic::Helper.create_empty_index
-    end
-
-    after do
-      Gitlab::Elastic::Helper.delete_index
-      stub_ee_application_setting(elasticsearch_search: false, elasticsearch_indexing: false)
-    end
-
-    context 'for wiki_blobs scope' do
-      before do
-        wiki = create(:project_wiki, project: project)
-        create(:wiki_page, wiki: wiki, attrs: { title: 'home', content: "Awesome page" })
-
-        project.wiki.index_blobs
-        Gitlab::Elastic::Helper.refresh_index
-
-        get api(endpoint, user), scope: 'wiki_blobs', search: 'awesome'
-      end
-
-      it_behaves_like 'response is correct', schema: 'public_api/v4/blobs'
-    end
-
-    context 'for commits scope' do
-      before do
-        repo_project.repository.index_commits
-        Gitlab::Elastic::Helper.refresh_index
-
-        get api(endpoint, user), scope: 'commits', search: 'folder'
-      end
-
-      it_behaves_like 'response is correct', schema: 'public_api/v4/commits_details', size: 2
-    end
-
-    context 'for blobs scope' do
-      before do
-        repo_project.repository.index_blobs
-        Gitlab::Elastic::Helper.refresh_index
-
-        get api(endpoint, user), scope: 'blobs', search: 'monitors'
-      end
-
-      it_behaves_like 'response is correct', schema: 'public_api/v4/blobs'
-    end
-  end
-
   describe 'GET /search'  do
     context 'when user is not authenticated' do
       it 'returns 401 error' do
@@ -109,8 +41,6 @@ describe API::Search do
     context 'with correct params' do
       context 'for projects scope' do
         before do
-          project
-
           get api('/search', user), scope: 'projects', search: 'awesome'
         end
 
@@ -166,18 +96,6 @@ describe API::Search do
 
         it_behaves_like 'response is correct', schema: 'public_api/v4/snippets'
       end
-
-      context 'when elasticsearch is disabled' do
-        it_behaves_like 'elasticsearch disabled' do
-          let(:endpoint) { '/search' }
-        end
-      end
-
-      context 'when elasticsearch is enabled' do
-        it_behaves_like 'elasticsearch enabled' do
-          let(:endpoint) { '/search' }
-        end
-      end
     end
   end
 
@@ -227,8 +145,6 @@ describe API::Search do
     context 'with correct params' do
       context 'for projects scope' do
         before do
-          project
-
           get api("/groups/#{group.id}/-/search", user), scope: 'projects', search: 'awesome'
         end
 
@@ -276,18 +192,6 @@ describe API::Search do
 
         it_behaves_like 'response is correct', schema: 'public_api/v4/milestones'
       end
-
-      context 'when elasticsearch is disabled' do
-        it_behaves_like 'elasticsearch disabled' do
-          let(:endpoint) { "/groups/#{group.id}/-/search" }
-        end
-      end
-
-      context 'when elasticsearch is enabled' do
-        it_behaves_like 'elasticsearch enabled' do
-          let(:endpoint) { "/groups/#{group.id}/-/search" }
-        end
-      end
     end
   end
 

spec/services/search/group_service_spec.rb

@@ -37,25 +37,4 @@ describe Search::GroupService do
   describe 'basic search' do
     include_examples 'group search'
   end
-
-  describe 'elasticsearch' do
-    before do
-      stub_ee_application_setting(elasticsearch_search: true, elasticsearch_indexing: true)
-      Gitlab::Elastic::Helper.create_empty_index
-
-      # Ensure these are present when the index is refreshed
-      _ = [
-        outside_project, private_project, other_project,
-        project1, project2, project3
-      ]
-
-      Gitlab::Elastic::Helper.refresh_index
-    end
-
-    after do
-      Gitlab::Elastic::Helper.delete_index
-    end
-
-    include_examples 'group search'
-  end
 end