Commit 38b03a7f authored by Natalia Tepluhina's avatar Natalia Tepluhina

Merge branch 'do-not-display-branch-link' into 'master'

Do not display branch link in saved changes message UI

See merge request gitlab-org/gitlab!29611
parents 1c75f002 60f51d7a
...@@ -60,7 +60,7 @@ export default { ...@@ -60,7 +60,7 @@ export default {
<ul> <ul>
<li> <li>
{{ s__('StaticSiteEditor|You created a new branch:') }} {{ s__('StaticSiteEditor|You created a new branch:') }}
<gl-link ref="branchLink" :href="branch.url">{{ branch.label }}</gl-link> <span ref="branchLink">{{ branch.label }}</span>
</li> </li>
<li> <li>
{{ s__('StaticSiteEditor|You created a merge request:') }} {{ s__('StaticSiteEditor|You created a merge request:') }}
......
---
title: Do not display branch link in saved changes message UI
merge_request: 29611
author:
type: changed
...@@ -51,11 +51,14 @@ describe('~/static_site_editor/components/saved_changes_message.vue', () => { ...@@ -51,11 +51,14 @@ describe('~/static_site_editor/components/saved_changes_message.vue', () => {
${'branch'} | ${findBranchLink} | ${props.branch} ${'branch'} | ${findBranchLink} | ${props.branch}
${'commit'} | ${findCommitLink} | ${props.commit} ${'commit'} | ${findCommitLink} | ${props.commit}
${'merge request'} | ${findMergeRequestLink} | ${props.mergeRequest} ${'merge request'} | ${findMergeRequestLink} | ${props.mergeRequest}
`('renders $desc link', ({ findEl, prop }) => { `('renders $desc link', ({ desc, findEl, prop }) => {
const el = findEl(); const el = findEl();
expect(el.exists()).toBe(true); expect(el.exists()).toBe(true);
expect(el.attributes('href')).toBe(prop.url);
expect(el.text()).toBe(prop.label); expect(el.text()).toBe(prop.label);
if (desc !== 'branch') {
expect(el.attributes('href')).toBe(prop.url);
}
}); });
}); });
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