summaryrefslogtreecommitdiff
path: root/spec/features
diff options
context:
space:
mode:
authorMatija Čupić <matteeyah@gmail.com>2018-10-23 15:03:10 +0200
committerMatija Čupić <matteeyah@gmail.com>2018-10-24 20:16:14 +0200
commit9f0dbf8a44cf8322edd5097f37b30853d78c4d79 (patch)
tree7d2513e33dbc1207355e003109a2f7245e9c0632 /spec/features
parentf8f1466ad07b3dcea7c0abc54fa25865b420b4f0 (diff)
downloadgitlab-ce-9f0dbf8a44cf8322edd5097f37b30853d78c4d79.tar.gz
Change CI status error message
Diffstat (limited to 'spec/features')
-rw-r--r--spec/features/merge_request/user_sees_merge_widget_spec.rb2
-rw-r--r--spec/features/merge_request/user_sees_pipelines_spec.rb2
2 files changed, 2 insertions, 2 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 f15129759de..6ad97e6912b 100644
--- a/spec/features/merge_request/user_sees_merge_widget_spec.rb
+++ b/spec/features/merge_request/user_sees_merge_widget_spec.rb
@@ -174,7 +174,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('Could not retrieve the pipeline status. For potential solutions please read the documentation.')
end
end
diff --git a/spec/features/merge_request/user_sees_pipelines_spec.rb b/spec/features/merge_request/user_sees_pipelines_spec.rb
index 45cccbee63e..1ab07e8e0db 100644
--- a/spec/features/merge_request/user_sees_pipelines_spec.rb
+++ b/spec/features/merge_request/user_sees_pipelines_spec.rb
@@ -42,7 +42,7 @@ describe 'Merge request > User sees pipelines', :js do
wait_for_requests
expect(page.find('.ci-widget')).to have_content(
- 'Could not connect to the CI server. Please check your settings and try again')
+ 'Could not retrieve the pipeline status. For potential solutions please read the documentation.')
end
end