diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-04-06 14:25:08 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-04-06 14:25:08 -0700 |
| commit | c527eadb74493528d415b34e4dcde91ada8b0ae6 (patch) | |
| tree | 517336d48126266cc0674e10de164bf662bf0fc9 | |
| parent | fe96152d8beab2f7f9fe8bdf1a8552fb0d98ebae (diff) | |
| download | gitlab-ce-c527eadb74493528d415b34e4dcde91ada8b0ae6.tar.gz | |
Fix the reCAPTCHA spec failures by not rendering the widget in test mode
We've seen changes in behavior in the reCAPTCHA widget that led to test failures.
To avoid these issues, don't render the widget at all in test mode.
Closes #45138
| -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') |