Commit 13b9efd6 authored by Sean McGivern's avatar Sean McGivern

Merge branch 'add-missing-stub-ee' into 'master'

Add missing `stub_ee_application_settings` change to ES specs

See merge request gitlab-org/gitlab-ee!4431
parents a38a799f b9764820
...@@ -35,13 +35,13 @@ describe API::Search do ...@@ -35,13 +35,13 @@ describe API::Search do
shared_examples 'elasticsearch enabled' do shared_examples 'elasticsearch enabled' do
before 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 Gitlab::Elastic::Helper.create_empty_index
end end
after do after do
Gitlab::Elastic::Helper.delete_index 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 end
context 'for wiki_blobs scope' do context 'for wiki_blobs scope' do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment