Stub Elasticsearch using stub_ee_application_setting

features/steps/project/elastic/global_search.rb

@@ -8,7 +8,7 @@ class Spinach::Features::GlobalSearch < Spinach::FeatureSteps
   include StubConfiguration
 
   before do
-    stub_application_setting(elasticsearch_search: true, elasticsearch_indexing: true)
+    stub_ee_application_setting(elasticsearch_search: true, elasticsearch_indexing: true)
 
     Gitlab::Elastic::Helper.create_empty_index
   end
@@ -16,7 +16,7 @@ class Spinach::Features::GlobalSearch < Spinach::FeatureSteps
   after do
     Gitlab::Elastic::Helper.delete_index
 
-    stub_application_setting(elasticsearch_search: false, elasticsearch_indexing: false)
+    stub_ee_application_setting(elasticsearch_search: false, elasticsearch_indexing: false)
   end
 
   step 'project has all data available for the search' do

features/steps/project/elastic/project_search.rb

@@ -6,7 +6,7 @@ class Spinach::Features::ProjectSearch < Spinach::FeatureSteps
   include StubConfiguration
 
   before do
-    stub_application_setting(elasticsearch_search: true, elasticsearch_indexing: true)
+    stub_ee_application_setting(elasticsearch_search: true, elasticsearch_indexing: true)
 
     Gitlab::Elastic::Helper.create_empty_index
   end
@@ -14,7 +14,7 @@ class Spinach::Features::ProjectSearch < Spinach::FeatureSteps
   after do
     Gitlab::Elastic::Helper.delete_index
 
-    stub_application_setting(elasticsearch_search: false, elasticsearch_indexing: false)
+    stub_ee_application_setting(elasticsearch_search: false, elasticsearch_indexing: false)
   end
 
   step 'project has all data available for the search' do

features/steps/project/elastic/snippets_search.rb

@@ -6,7 +6,7 @@ class Spinach::Features::SnippetsSearch < Spinach::FeatureSteps
   include StubConfiguration
 
   before do
-    stub_application_setting(elasticsearch_search: true, elasticsearch_indexing: true)
+    stub_ee_application_setting(elasticsearch_search: true, elasticsearch_indexing: true)
 
     Gitlab::Elastic::Helper.create_empty_index
   end
@@ -14,7 +14,7 @@ class Spinach::Features::SnippetsSearch < Spinach::FeatureSteps
   after do
     Gitlab::Elastic::Helper.delete_index
 
-    stub_application_setting(elasticsearch_search: false, elasticsearch_indexing: false)
+    stub_ee_application_setting(elasticsearch_search: false, elasticsearch_indexing: false)
   end
 
   step 'there is a snippet "index" with "php rocks" string' do

features/steps/shared/elastic.rb

@@ -25,7 +25,7 @@ module SharedElastic
   end
 
   step 'Elasticsearch is enabled' do
-    stub_application_setting(elasticsearch_search: true, elasticsearch_indexing: true)
+    stub_ee_application_setting(elasticsearch_search: true, elasticsearch_indexing: true)
   end
 
   def select_filter(name)

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

@@ -2,13 +2,13 @@ require 'spec_helper'
 
 describe Issue, elastic: true do
   before do
-    stub_application_setting(elasticsearch_search: true, elasticsearch_indexing: true)
+    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_application_setting(elasticsearch_search: false, elasticsearch_indexing: false)
+    stub_ee_application_setting(elasticsearch_search: false, elasticsearch_indexing: false)
   end
 
   let(:project) { create :project }

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

@@ -2,13 +2,13 @@ require 'spec_helper'
 
 describe MergeRequest, elastic: true do
   before do
-    stub_application_setting(elasticsearch_search: true, elasticsearch_indexing: true)
+    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_application_setting(elasticsearch_search: false, elasticsearch_indexing: false)
+    stub_ee_application_setting(elasticsearch_search: false, elasticsearch_indexing: false)
   end
 
   it "searches merge requests" do

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

@@ -2,13 +2,13 @@ require 'spec_helper'
 
 describe Milestone, elastic: true do
   before do
-    stub_application_setting(elasticsearch_search: true, elasticsearch_indexing: true)
+    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_application_setting(elasticsearch_search: false, elasticsearch_indexing: false)
+    stub_ee_application_setting(elasticsearch_search: false, elasticsearch_indexing: false)
   end
 
   it "searches milestones" do

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

@@ -2,13 +2,13 @@ require 'spec_helper'
 
 describe Note, elastic: true do
   before do
-    stub_application_setting(elasticsearch_search: true, elasticsearch_indexing: true)
+    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_application_setting(elasticsearch_search: false, elasticsearch_indexing: false)
+    stub_ee_application_setting(elasticsearch_search: false, elasticsearch_indexing: false)
   end
 
   it "searches notes" do

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

@@ -2,13 +2,13 @@ require 'spec_helper'
 
 describe Project, elastic: true do
   before do
-    stub_application_setting(elasticsearch_search: true, elasticsearch_indexing: true)
+    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_application_setting(elasticsearch_search: false, elasticsearch_indexing: false)
+    stub_ee_application_setting(elasticsearch_search: false, elasticsearch_indexing: false)
   end
 
   it "finds projects" do

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

@@ -2,13 +2,13 @@ require 'spec_helper'
 
 describe ProjectWiki, elastic: true do
   before do
-    stub_application_setting(elasticsearch_search: true, elasticsearch_indexing: true)
+    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_application_setting(elasticsearch_search: false, elasticsearch_indexing: false)
+    stub_ee_application_setting(elasticsearch_search: false, elasticsearch_indexing: false)
   end
 
   it "searches wiki page" do

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

@@ -2,13 +2,13 @@ require 'spec_helper'
 
 describe Repository, elastic: true do
   before do
-    stub_application_setting(elasticsearch_search: true, elasticsearch_indexing: true)
+    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_application_setting(elasticsearch_search: false, elasticsearch_indexing: false)
+    stub_ee_application_setting(elasticsearch_search: false, elasticsearch_indexing: false)
   end
 
   def index!(project)

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

@@ -2,13 +2,13 @@ require 'spec_helper'
 
 describe Snippet, elastic: true do
   before do
-    stub_application_setting(elasticsearch_search: true, elasticsearch_indexing: true)
+    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_application_setting(elasticsearch_search: false, elasticsearch_indexing: false)
+    stub_ee_application_setting(elasticsearch_search: false, elasticsearch_indexing: false)
   end
 
   context 'searching snippets by code' do

spec/ee/spec/workers/post_receive_spec.rb

+# coding: utf-8
 require 'spec_helper'
 
 describe PostReceive do
@@ -46,7 +47,7 @@ describe PostReceive do
     end
 
     it 'triggers wiki index update when ElasticSearch is enabled' do
-      stub_application_setting(elasticsearch_search: true, elasticsearch_indexing: true)
+      stub_ee_application_setting(elasticsearch_search: true, elasticsearch_indexing: true)
 
       expect_any_instance_of(ProjectWiki).to receive(:index_blobs)
 

spec/elastic_integration/elasticsearch_model_client_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 # This module is monkey-patched in config/initializers/elastic_client_setup.rb
 describe "Monkey-patches to ::Elasticsearch::Model::Client" do
   before do
-    stub_application_setting(elasticsearch_url: ['http://localhost:9200'])
+    stub_ee_application_setting(elasticsearch_url: ['http://localhost:9200'])
   end
 
   it 'uses the same client instance for all subclasses' do

spec/features/es_global_search_spec.rb

@@ -5,7 +5,7 @@ feature 'Global elastic search' do
   let(:project) { create(:project, :repository, namespace: user.namespace) }
 
   before do
-    stub_application_setting(elasticsearch_search: true, elasticsearch_indexing: true)
+    stub_ee_application_setting(elasticsearch_search: true, elasticsearch_indexing: true)
     Gitlab::Elastic::Helper.create_empty_index
 
     project.add_master(user)
@@ -14,7 +14,7 @@ feature 'Global elastic search' do
 
   after do
     Gitlab::Elastic::Helper.delete_index
-    stub_application_setting(elasticsearch_search: false, elasticsearch_indexing: false)
+    stub_ee_application_setting(elasticsearch_search: false, elasticsearch_indexing: false)
   end
 
   describe 'I search through the issues and I see pagination' do

spec/features/es_group_search_spec.rb

@@ -15,7 +15,7 @@ feature 'Group elastic search', :js do
   end
 
   before do
-    stub_application_setting(elasticsearch_search: true, elasticsearch_indexing: true)
+    stub_ee_application_setting(elasticsearch_search: true, elasticsearch_indexing: true)
     Gitlab::Elastic::Helper.create_empty_index
 
     project.add_master(user)
@@ -26,7 +26,7 @@ feature 'Group elastic search', :js do
 
   after do
     Gitlab::Elastic::Helper.delete_index
-    stub_application_setting(elasticsearch_search: false, elasticsearch_indexing: false)
+    stub_ee_application_setting(elasticsearch_search: false, elasticsearch_indexing: false)
   end
 
   describe 'issue search' do

spec/helpers/search_helper_spec.rb

@@ -8,13 +8,13 @@ describe SearchHelper do
 
   describe '#parse_search_result_from_elastic' do
     before do
-      stub_application_setting(elasticsearch_search: true, elasticsearch_indexing: true)
+      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_application_setting(elasticsearch_search: false, elasticsearch_indexing: false)
+      stub_ee_application_setting(elasticsearch_search: false, elasticsearch_indexing: false)
     end
 
     it "returns parsed result" do

spec/lib/gitlab/elastic/indexer_spec.rb

@@ -5,7 +5,7 @@ describe Gitlab::Elastic::Indexer do
 
   before do
     stub_env('IN_MEMORY_APPLICATION_SETTINGS', 'true')
-    stub_application_setting(elasticsearch_url: ['http://localhost:9200'])
+    stub_ee_application_setting(elasticsearch_url: ['http://localhost:9200'])
   end
 
   let(:project)  { create(:project, :repository) }
@@ -88,7 +88,7 @@ describe Gitlab::Elastic::Indexer do
 
   context 'experimental indexer enabled' do
     before do
-      stub_application_setting(elasticsearch_experimental_indexer: true)
+      stub_ee_application_setting(elasticsearch_experimental_indexer: true)
     end
 
     it 'uses the normal indexer when not present' do

spec/lib/gitlab/elastic/project_search_results_spec.rb

@@ -6,13 +6,13 @@ describe Gitlab::Elastic::ProjectSearchResults do
   let(:query) { 'hello world' }
 
   before do
-    stub_application_setting(elasticsearch_search: true, elasticsearch_indexing: true)
+    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_application_setting(elasticsearch_search: false, elasticsearch_indexing: false)
+    stub_ee_application_setting(elasticsearch_search: false, elasticsearch_indexing: false)
   end
 
   describe 'initialize with empty ref' do

spec/lib/gitlab/elastic/search_results_spec.rb

+# coding: utf-8
 require 'spec_helper'
 
 describe Gitlab::Elastic::SearchResults do
   before do
-    stub_application_setting(elasticsearch_search: true, elasticsearch_indexing: true)
+    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_application_setting(elasticsearch_search: false, elasticsearch_indexing: false)
+    stub_ee_application_setting(elasticsearch_search: false, elasticsearch_indexing: false)
   end
 
   let(:user) { create(:user) }

spec/models/project_spec.rb

@@ -1824,7 +1824,7 @@ describe Project do
 
       context 'elasticsearch indexing disabled' do
         before do
-          stub_application_setting(elasticsearch_indexing: false)
+          stub_ee_application_setting(elasticsearch_indexing: false)
         end
 
         it 'does not index the repository' do
@@ -1840,7 +1840,7 @@ describe Project do
         let(:project) { create(:project, :import_started, import_type: :github) }
 
         before do
-          stub_application_setting(elasticsearch_indexing: true)
+          stub_ee_application_setting(elasticsearch_indexing: true)
         end
 
         context 'no index status' do

spec/models/repository_spec.rb

@@ -1755,13 +1755,13 @@ describe Repository do
 
   describe "Elastic search", :elastic do
     before do
-      stub_application_setting(elasticsearch_search: true, elasticsearch_indexing: true)
+      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_application_setting(elasticsearch_search: false, elasticsearch_indexing: false)
+      stub_ee_application_setting(elasticsearch_search: false, elasticsearch_indexing: false)
     end
 
     describe "class method find_commits_by_message_with_elastic" do

spec/services/git_push_service_spec.rb

@@ -205,11 +205,11 @@ describe GitPushService do
 
   describe "ES indexing" do
     before do
-      stub_application_setting(elasticsearch_search: true, elasticsearch_indexing: true)
+      stub_ee_application_setting(elasticsearch_search: true, elasticsearch_indexing: true)
     end
 
     after do
-      stub_application_setting(elasticsearch_search: false, elasticsearch_indexing: false)
+      stub_ee_application_setting(elasticsearch_search: false, elasticsearch_indexing: false)
     end
 
     it "does not trigger indexer when push to non-default branch" do

spec/services/search/group_service_spec.rb

@@ -40,7 +40,7 @@ describe Search::GroupService do
 
   describe 'elasticsearch' do
     before do
-      stub_application_setting(elasticsearch_search: true, elasticsearch_indexing: true)
+      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

spec/workers/elastic_commit_indexer_worker_spec.rb

@@ -7,7 +7,7 @@ describe ElasticCommitIndexerWorker do
 
   describe '#perform' do
     before do
-      stub_application_setting(elasticsearch_indexing: true)
+      stub_ee_application_setting(elasticsearch_indexing: true)
     end
 
     it 'runs indexer' do
@@ -17,7 +17,7 @@ describe ElasticCommitIndexerWorker do
     end
 
     it 'returns true if ES disabled' do
-      stub_application_setting(elasticsearch_indexing: false)
+      stub_ee_application_setting(elasticsearch_indexing: false)
 
       expect_any_instance_of(Gitlab::Elastic::Indexer).not_to receive(:run)
 

spec/workers/elastic_indexer_worker_spec.rb

@@ -4,7 +4,7 @@ describe ElasticIndexerWorker, elastic: true do
   subject { described_class.new }
 
   before do
-    stub_application_setting(elasticsearch_indexing: true)
+    stub_ee_application_setting(elasticsearch_indexing: true)
 
     Elasticsearch::Model.client =
       Gitlab::Elastic::Client.build(Gitlab::CurrentSettings.elasticsearch_config)
@@ -17,7 +17,7 @@ describe ElasticIndexerWorker, elastic: true do
   end
 
   it 'returns true if ES disabled' do
-    stub_application_setting(elasticsearch_indexing: false)
+    stub_ee_application_setting(elasticsearch_indexing: false)
 
     expect_any_instance_of(Elasticsearch::Model).not_to receive(:__elasticsearch__)