Commit db4de93c authored by Kamil Trzciński's avatar Kamil Trzciński

Merge branch 'ccr/6318_system_note_for_issue' into 'master'

Add link to issue on epic

Closes #6318

See merge request gitlab-org/gitlab-ee!7407
parents cac5471a dc9b21e7
---
title: Add link to issue on epic
merge_request: 7407
author:
type: fixed
...@@ -135,6 +135,43 @@ describe Groups::EpicsController do ...@@ -135,6 +135,43 @@ describe Groups::EpicsController do
end end
end end
describe 'GET #discussions' do
before do
sign_in(user)
group.add_developer(user)
SystemNoteService.epic_issue(epic, issue, user, :added)
end
context 'when issue note is returned' do
shared_examples 'issue link presence' do
let(:issue) { create(:issue, project: project, description: "Project Issue") }
it 'the link to the issue is included' do
get :discussions, group_id: group, id: epic.to_param
expect(response).to have_gitlab_http_status(200)
expect(json_response.size).to eq(1)
discussion = json_response[0]
notes = discussion["notes"]
expect(notes.size).to eq(1)
expect(notes[0]["note_html"]).to include(project_issue_path(project, issue))
end
end
describe 'project default namespace' do
it_behaves_like 'issue link presence' do
let(:project) { create(:project, :public) }
end
end
describe 'project group namespace' do
it_behaves_like 'issue link presence' do
let(:project) {create(:project, namespace: group)}
end
end
end
end
describe 'GET #show' do describe 'GET #show' do
def show_epic(format = :html) def show_epic(format = :html)
get :show, group_id: group, id: epic.to_param, format: format get :show, group_id: group, id: epic.to_param, format: format
......
...@@ -327,7 +327,7 @@ module Banzai ...@@ -327,7 +327,7 @@ module Banzai
end end
def current_project_namespace_path def current_project_namespace_path
@current_project_namespace_path ||= project&.namespace&.full_path @current_project_namespace_path ||= (project&.namespace || group)&.full_path
end end
private private
......
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