diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-04-06 22:38:37 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-04-06 22:38:37 +0000 |
| commit | 85f4e323f9be5b7056850be353d8689d503a5c86 (patch) | |
| tree | a9c3aeda6664bf1a1084661cc8bb78c6f83e7607 | |
| parent | 9421a597b749b50b75c05f94a144f2a7885b5ee0 (diff) | |
| parent | c527eadb74493528d415b34e4dcde91ada8b0ae6 (diff) | |
| download | gitlab-ce-85f4e323f9be5b7056850be353d8689d503a5c86.tar.gz | |
Merge branch 'sh-fix-recaptcha-test' into 'master'
Fix the reCAPTCHA spec failures by not rendering the widget in test mode
Closes #45138
See merge request gitlab-org/gitlab-ce!18235
| -rw-r--r-- | app/views/shared/_recaptcha_form.html.haml | 2 | ||||
| -rw-r--r-- | spec/features/issues/spam_issues_spec.rb | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/app/views/shared/_recaptcha_form.html.haml b/app/views/shared/_recaptcha_form.html.haml index 93a4301f366..a0ba1afc284 100644 --- a/app/views/shared/_recaptcha_form.html.haml +++ b/app/views/shared/_recaptcha_form.html.haml @@ -10,7 +10,7 @@ = hidden_field(resource_name, field, value: value) = hidden_field_tag(:spam_log_id, spammable.spam_log.id) = hidden_field_tag(:recaptcha_verification, true) - = recaptcha_tags script: script, callback: 'recaptchaDialogCallback' + = recaptcha_tags script: script, callback: 'recaptchaDialogCallback' unless Rails.env.test? -# Yields a block with given extra params. = yield diff --git a/spec/features/issues/spam_issues_spec.rb b/spec/features/issues/spam_issues_spec.rb index a75ca1d42b3..73022afbda2 100644 --- a/spec/features/issues/spam_issues_spec.rb +++ b/spec/features/issues/spam_issues_spec.rb @@ -34,9 +34,6 @@ describe 'New issue', :js do click_button 'Submit issue' - # reCAPTCHA alerts when it can't contact the server, so just accept it and move on - page.driver.browser.switch_to.alert.accept - # it is impossible to test recaptcha automatically and there is no possibility to fill in recaptcha # recaptcha verification is skipped in test environment and it always returns true expect(page).not_to have_content('issue title') |