diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-19 00:06:37 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-19 00:06:37 +0300 |
| commit | 4682f5015a5a2d7eedb66b3c90aee931d3789d0b (patch) | |
| tree | 6240a8a5cf3584a893c6c3351141446e7856dc12 /spec/views | |
| parent | 6d59e989185a7d2645792b713d1b5d95d46651fd (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/views')
| -rw-r--r-- | spec/views/devise/shared/_signin_box.html.haml_spec.rb | 1 | ||||
| -rw-r--r-- | spec/views/layouts/_head.html.haml_spec.rb | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/spec/views/devise/shared/_signin_box.html.haml_spec.rb b/spec/views/devise/shared/_signin_box.html.haml_spec.rb index 6d640686337..f8867477603 100644 --- a/spec/views/devise/shared/_signin_box.html.haml_spec.rb +++ b/spec/views/devise/shared/_signin_box.html.haml_spec.rb @@ -10,6 +10,7 @@ describe 'devise/shared/_signin_box' do allow(view).to receive(:current_application_settings).and_return(Gitlab::CurrentSettings.current_application_settings) allow(view).to receive(:captcha_enabled?).and_return(false) allow(view).to receive(:captcha_on_login_required?).and_return(false) + allow(view).to receive(:experiment_enabled?).and_return(false) end it 'is shown when Crowd is enabled' do diff --git a/spec/views/layouts/_head.html.haml_spec.rb b/spec/views/layouts/_head.html.haml_spec.rb index bea0b0edf4d..e9b3334fffc 100644 --- a/spec/views/layouts/_head.html.haml_spec.rb +++ b/spec/views/layouts/_head.html.haml_spec.rb @@ -7,6 +7,7 @@ describe 'layouts/_head' do before do allow(view).to receive(:current_application_settings).and_return(Gitlab::CurrentSettings.current_application_settings) + allow(view).to receive(:experiment_enabled?).and_return(false) end it 'escapes HTML-safe strings in page_title' do |