Show correct message when user cannot resolve discussions
This commit is contained in:
parent
40dd993774
commit
ab52086290
3 changed files with 125 additions and 90 deletions
|
@ -58,9 +58,12 @@
|
|||
Creating this issue will resolve all discussions in
|
||||
= link_to_discussions_to_resolve(@merge_request_for_resolving_discussions, @discussion_to_resolve)
|
||||
- else
|
||||
The discussion at
|
||||
The
|
||||
= @discussion_to_resolve ? 'discussion' : 'discussions'
|
||||
at
|
||||
= link_to_discussions_to_resolve(@merge_request_for_resolving_discussions, @discussion_to_resolve)
|
||||
will stay unresolved. Ask someone with permission to resolve it.
|
||||
will stay unresolved. Ask someone with permission to resolve
|
||||
= @discussion_to_resolve ? 'it.' : 'them.'
|
||||
|
||||
- is_footer = !(issuable.is_a?(MergeRequest) && issuable.new_record?)
|
||||
.row-content-block{ class: (is_footer ? "footer-block" : "middle-block") }
|
||||
|
|
|
@ -6,6 +6,7 @@ feature 'Resolving all open discussions in a merge request from an issue', featu
|
|||
let(:merge_request) { create(:merge_request, source_project: project) }
|
||||
let!(:discussion) { Discussion.for_diff_notes([create(:diff_note_on_merge_request, noteable: merge_request, project: project)]).first }
|
||||
|
||||
describe 'as a user with access to the project' do
|
||||
before do
|
||||
project.team << [user, :master]
|
||||
login_as user
|
||||
|
@ -76,4 +77,17 @@ feature 'Resolving all open discussions in a merge request from an issue', featu
|
|||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
describe 'as a reporter' do
|
||||
before do
|
||||
project.team << [user, :reporter]
|
||||
login_as user
|
||||
visit new_namespace_project_issue_path(project.namespace, project, merge_request_for_resolving_discussions: merge_request.iid)
|
||||
end
|
||||
|
||||
it 'Shows a notice to ask someone else to resolve the discussions' do
|
||||
expect(page).to have_content("The discussions at #{merge_request.to_reference} will stay unresolved. Ask someone with permission to resolve them.")
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
@ -6,6 +6,7 @@ feature 'Resolve an open discussion in a merge request by creating an issue', fe
|
|||
let(:merge_request) { create(:merge_request, source_project: project) }
|
||||
let!(:discussion) { Discussion.for_diff_notes([create(:diff_note_on_merge_request, noteable: merge_request, project: project)]).first }
|
||||
|
||||
describe 'As a user with access to the project' do
|
||||
before do
|
||||
project.team << [user, :master]
|
||||
login_as user
|
||||
|
@ -60,4 +61,21 @@ feature 'Resolve an open discussion in a merge request by creating an issue', fe
|
|||
|
||||
it_behaves_like 'creating an issue for a discussion'
|
||||
end
|
||||
end
|
||||
|
||||
describe 'as a reporter' do
|
||||
before do
|
||||
project.team << [user, :reporter]
|
||||
login_as user
|
||||
visit new_namespace_project_issue_path(project.namespace, project,
|
||||
merge_request_for_resolving_discussions: merge_request.iid,
|
||||
discussion_to_resolve: discussion.id)
|
||||
end
|
||||
|
||||
it 'Shows a notice to ask someone else to resolve the discussions' do
|
||||
expect(page).to have_content("The discussion at #{merge_request.to_reference}"\
|
||||
"(discussion #{discussion.first_note.id}) will stay unresolved."\
|
||||
"Ask someone with permission to resolve it.")
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue