diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-24 18:08:44 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-24 18:08:44 +0300 |
commit | 120f4aaedc8fe830a3f572491d240d8ee6addefb (patch) | |
tree | a2138baa55dfa67d292fb1a83ce686ee7f5d10a5 /spec/views/admin | |
parent | 729e3765d5feb762df1ccfbc228a8dd4662aa3f9 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/views/admin')
-rw-r--r-- | spec/views/admin/application_settings/general.html.haml_spec.rb (renamed from spec/views/admin/application_settings/integrations.html.haml_spec.rb) | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/spec/views/admin/application_settings/integrations.html.haml_spec.rb b/spec/views/admin/application_settings/general.html.haml_spec.rb index 392d43ef2d4..e6a0307afd9 100644 --- a/spec/views/admin/application_settings/integrations.html.haml_spec.rb +++ b/spec/views/admin/application_settings/general.html.haml_spec.rb @@ -2,8 +2,9 @@ require 'spec_helper' -describe 'admin/application_settings/integrations.html.haml' do +describe 'admin/application_settings/general.html.haml' do let(:app_settings) { build(:application_setting) } + let(:user) { create(:admin) } describe 'sourcegraph integration' do let(:sourcegraph_flag) { true } @@ -11,6 +12,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(view).to receive(:current_user).and_return(user) end context 'when sourcegraph feature is enabled' do |