diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2019-08-29 17:17:37 -0500 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2019-08-29 17:17:37 -0500 |
| commit | 7698d405506bc10dfd7fb2e6e02b419dd5925725 (patch) | |
| tree | b2c188fd3bc588f15d04d8ce6137f9447f7a72c7 /spec/views | |
| parent | fa160c26b14d233eb2e3b861a0742766d1ac734b (diff) | |
| parent | 090956259c47d839b136f9391c3f74255764da81 (diff) | |
| download | gitlab-ce-7698d405506bc10dfd7fb2e6e02b419dd5925725.tar.gz | |
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq
Diffstat (limited to 'spec/views')
| -rw-r--r-- | spec/views/devise/shared/_signin_box.html.haml_spec.rb | 1 |
1 files changed, 1 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 66c064e3fba..5d521d18c70 100644 --- a/spec/views/devise/shared/_signin_box.html.haml_spec.rb +++ b/spec/views/devise/shared/_signin_box.html.haml_spec.rb @@ -7,6 +7,7 @@ describe 'devise/shared/_signin_box' do assign(:ldap_servers, []) 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) end it 'is shown when Crowd is enabled' do |