diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-22 00:08:57 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-22 00:08:57 +0300 |
| commit | a6c2be7cd20a9515b347e72d63c5b47bb9b79457 (patch) | |
| tree | 568212b4debeb2a35bb1133209b98e1468d9ee85 /spec/views | |
| parent | 74a2d57b337034cfdcd719615e4da06643b69114 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/views')
| -rw-r--r-- | spec/views/admin/application_settings/integrations.html.haml_spec.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/spec/views/admin/application_settings/integrations.html.haml_spec.rb b/spec/views/admin/application_settings/integrations.html.haml_spec.rb index 392d43ef2d4..e51cbb9fbfe 100644 --- a/spec/views/admin/application_settings/integrations.html.haml_spec.rb +++ b/spec/views/admin/application_settings/integrations.html.haml_spec.rb @@ -11,6 +11,7 @@ describe 'admin/application_settings/integrations.html.haml' do before do assign(:application_setting, app_settings) allow(Gitlab::Sourcegraph).to receive(:feature_available?).and_return(sourcegraph_flag) + allow(License).to receive(:feature_available?).with(:elastic_search).and_return(false) if defined?(License) end context 'when sourcegraph feature is enabled' do |