kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Change CI status error message

Browse source
This commit is contained in:
Matija Čupić 2018-10-23 15:03:10 +02:00
parent f8f1466ad0
commit 9f0dbf8a44
No known key found for this signature in database
GPG key ID: 4BAF84FFACD2E5DE
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue
View file

@ -78,7 +78,7 @@ export default {
/> />
</div> </div>
<div class="media-body"> <div class="media-body">
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 <a href="#">documentation</a>.
</div> </div>
</template> </template>
<template v-else-if="hasPipeline"> <template v-else-if="hasPipeline">

2
spec/features/merge_request/user_sees_merge_widget_spec.rb
View file

@ -174,7 +174,7 @@ describe 'Merge request > User sees merge widget', :js do
# Wait for the `ci_status` and `merge_check` requests # Wait for the `ci_status` and `merge_check` requests
wait_for_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
end end

2
spec/features/merge_request/user_sees_pipelines_spec.rb
View file

@ -42,7 +42,7 @@ describe 'Merge request > User sees pipelines', :js do
wait_for_requests wait_for_requests
expect(page.find('.ci-widget')).to have_content( 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
end end

2
spec/javascripts/vue_mr_widget/components/mr_widget_pipeline_spec.js
View file

@ -69,7 +69,7 @@ describe('MRWidgetPipeline', () => {
expect( expect(
vm.$el.querySelector('.media-body').textContent.trim(), vm.$el.querySelector('.media-body').textContent.trim(),
).toEqual('Could not connect to the CI server. Please check your settings and try again'); ).toEqual('Could not retrieve the pipeline status. For potential solutions please read the documentation.');
}); });
describe('with a pipeline', () => { describe('with a pipeline', () => {