diff options
| author | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-08-29 21:34:12 +0000 |
|---|---|---|
| committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-08-29 21:34:12 +0000 |
| commit | a5b2a3786056ddf99de06c8315e9a42c3bf86cd5 (patch) | |
| tree | b2e02a060e3df9a078706230ee7a6064ac4bbd85 /spec/features/admin/admin_settings_spec.rb | |
| parent | e20fb7cb395e9c6594a098eddd816079259f64d9 (diff) | |
| parent | dfcf4cf5f1e87a29f0d9fcc5ff2bba47258893bb (diff) | |
| download | gitlab-ce-a5b2a3786056ddf99de06c8315e9a42c3bf86cd5.tar.gz | |
Merge branch 'security-59549-add-capcha-for-failed-logins' into 'master'
Require a captcha after unique failed logins from the same IP
See merge request gitlab/gitlabhq!3270
Diffstat (limited to 'spec/features/admin/admin_settings_spec.rb')
| -rw-r--r-- | spec/features/admin/admin_settings_spec.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/spec/features/admin/admin_settings_spec.rb b/spec/features/admin/admin_settings_spec.rb index ddd87404003..eb59de2e132 100644 --- a/spec/features/admin/admin_settings_spec.rb +++ b/spec/features/admin/admin_settings_spec.rb @@ -263,6 +263,7 @@ describe 'Admin updates settings' do page.within('.as-spam') do check 'Enable reCAPTCHA' + check 'Enable reCAPTCHA for login' fill_in 'reCAPTCHA Site Key', with: 'key' fill_in 'reCAPTCHA Private Key', with: 'key' fill_in 'IPs per user', with: 15 @@ -271,6 +272,7 @@ describe 'Admin updates settings' do expect(page).to have_content "Application settings saved successfully" expect(current_settings.recaptcha_enabled).to be true + expect(current_settings.login_recaptcha_protection_enabled).to be true expect(current_settings.unique_ips_limit_per_user).to eq(15) end end |