Commit 7a726160 authored by Phil Hughes's avatar Phil Hughes

Merge branch '53533-fix-broken-link' into 'master'

Renders unescaped `sprinft` string

Closes #53533

See merge request gitlab-org/gitlab-ce!22807
parents b4ecbef2 0c249957
...@@ -71,6 +71,7 @@ export default { ...@@ -71,6 +71,7 @@ export default {
linkStart: `<a href="${this.troubleshootingDocsPath}">`, linkStart: `<a href="${this.troubleshootingDocsPath}">`,
linkEnd: '</a>', linkEnd: '</a>',
}, },
false,
); );
}, },
}, },
......
---
title: Render unescaped link for failed pipeline status
merge_request: 22807
author:
type: fixed
...@@ -179,7 +179,7 @@ describe 'Merge request > User sees merge widget', :js do ...@@ -179,7 +179,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(%r{Could not retrieve the pipeline status\. For troubleshooting steps, read the <a href=\".+\">documentation\.</a>}) expect(page).to have_text("Could not retrieve the pipeline status. For troubleshooting steps, read the documentation.")
end end
end end
......
...@@ -41,8 +41,7 @@ describe 'Merge request > User sees pipelines', :js do ...@@ -41,8 +41,7 @@ describe 'Merge request > User sees pipelines', :js do
visit project_merge_request_path(project, merge_request) visit project_merge_request_path(project, merge_request)
wait_for_requests wait_for_requests
expect(page.find('.ci-widget')).to have_text( expect(page.find('.ci-widget')).to have_text("Could not retrieve the pipeline status. For troubleshooting steps, read the documentation.")
%r{Could not retrieve the pipeline status\. For troubleshooting steps, read the <a href=\".+\">documentation\.</a>})
end end
end end
......
...@@ -73,7 +73,7 @@ describe('MRWidgetPipeline', () => { ...@@ -73,7 +73,7 @@ describe('MRWidgetPipeline', () => {
}); });
expect(vm.$el.querySelector('.media-body').textContent.trim()).toContain( expect(vm.$el.querySelector('.media-body').textContent.trim()).toContain(
'Could not retrieve the pipeline status. For troubleshooting steps, read the <a href="help">documentation.</a>', 'Could not retrieve the pipeline status. For troubleshooting steps, read the documentation.',
); );
}); });
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment