Commit 70b40180 authored by Filipa Lacerda's avatar Filipa Lacerda

Merge branch '4911-links-in-issue-board-are-broken' into 'master'

Resolve "Links in issue board are broken"

Closes #4911

See merge request gitlab-org/gitlab-ee!4494
parents e5a4ab49 0573b3d5
...@@ -176,6 +176,7 @@ export default { ...@@ -176,6 +176,7 @@ export default {
<loading-icon /> <loading-icon />
</div> </div>
<board-new-issue <board-new-issue
:group-id="groupId"
:list="list" :list="list"
v-if="list.type !== 'closed' && showIssueForm"/> v-if="list.type !== 'closed' && showIssueForm"/>
<ul <ul
...@@ -191,6 +192,7 @@ export default { ...@@ -191,6 +192,7 @@ export default {
:list="list" :list="list"
:issue="issue" :issue="issue"
:issue-link-base="issueLinkBase" :issue-link-base="issueLinkBase"
:group-id="groupId"
:root-path="rootPath" :root-path="rootPath"
:disabled="disabled" :disabled="disabled"
:key="issue.id" /> :key="issue.id" />
......
...@@ -38,6 +38,9 @@ describe('Board list component', () => { ...@@ -38,6 +38,9 @@ describe('Board list component', () => {
confidential: false, confidential: false,
labels: [], labels: [],
assignees: [], assignees: [],
project: {
path: '/test',
},
}); });
list.issuesSize = 1; list.issuesSize = 1;
list.issues.push(issue); list.issues.push(issue);
...@@ -49,7 +52,8 @@ describe('Board list component', () => { ...@@ -49,7 +52,8 @@ describe('Board list component', () => {
list, list,
issues: list.issues, issues: list.issues,
loading: false, loading: false,
issueLinkBase: '/issues', groupId: 1,
issueLinkBase: '/test/:project_path/issues',
rootPath: '/', rootPath: '/',
}, },
}).$mount(); }).$mount();
...@@ -87,6 +91,12 @@ describe('Board list component', () => { ...@@ -87,6 +91,12 @@ describe('Board list component', () => {
).toBe(1); ).toBe(1);
}); });
it('renders link properly in issue', () => {
expect(
component.$el.querySelector('.card .card-title a').getAttribute('href'),
).not.toContain(':project_path');
});
it('sets data attribute with issue id', () => { it('sets data attribute with issue id', () => {
expect( expect(
component.$el.querySelector('.card').getAttribute('data-issue-id'), component.$el.querySelector('.card').getAttribute('data-issue-id'),
......
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