diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-10-31 10:29:44 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-10-31 10:29:44 +0000 |
| commit | e89534796dba6fd82fd1e0b26dacb24412b74441 (patch) | |
| tree | 35327a85936af9cc5dcf204a5e88d2f26ee38e92 /spec/features/merge_request/user_sees_merge_widget_spec.rb | |
| parent | 98a504ecbb45907517ae465018906af7ef4573de (diff) | |
| parent | 10af12b4112bdf6a604edeffa236360686d36d8d (diff) | |
| download | gitlab-ce-e89534796dba6fd82fd1e0b26dacb24412b74441.tar.gz | |
Merge branch '41545-gitlab-merge-request-status-could-not-connect-to-the-ci-server-please-check-your-settings-and-try-again' into 'master'
Resolve "Reword error message for internal CI unknown pipeline status"
Closes #53056
See merge request gitlab-org/gitlab-ce!22474
Diffstat (limited to 'spec/features/merge_request/user_sees_merge_widget_spec.rb')
| -rw-r--r-- | spec/features/merge_request/user_sees_merge_widget_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/features/merge_request/user_sees_merge_widget_spec.rb b/spec/features/merge_request/user_sees_merge_widget_spec.rb index d2003b61b2a..0c610edd6d1 100644 --- a/spec/features/merge_request/user_sees_merge_widget_spec.rb +++ b/spec/features/merge_request/user_sees_merge_widget_spec.rb @@ -179,7 +179,7 @@ describe 'Merge request > User sees merge widget', :js do # Wait for the `ci_status` and `merge_check` requests wait_for_requests - expect(page).to have_text('Could not connect to the CI server. Please check your settings and try again') + expect(page).to have_text(%r{Could not retrieve the pipeline status\. For troubleshooting steps, read the <a href=\".+\">documentation\.</a>}) end end |