1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
|
# frozen_string_literal: true
require 'spec_helper'
RSpec.describe 'Resolving all open threads in a merge request from an issue', :js do
let(:user) { create(:user) }
let(:project) { create(:project, :repository) }
let(:merge_request) { create(:merge_request, source_project: project) }
let!(:discussion) { create(:diff_note_on_merge_request, noteable: merge_request, project: project).to_discussion }
def resolve_all_discussions_link_selector(title: "")
url = new_project_issue_path(project, merge_request_to_resolve_discussions_of: merge_request.iid)
if title.empty?
%Q{a[href="#{url}"]}
else
%Q{a[title="#{title}"][href="#{url}"]}
end
end
before do
stub_feature_flags(moved_mr_sidebar: false)
end
describe 'as a user with access to the project' do
before do
project.add_maintainer(user)
sign_in user
visit project_merge_request_path(project, merge_request)
end
it 'shows a button to resolve all threads by creating a new issue' do
find('.discussions-counter .dropdown-toggle').click
within('.discussions-counter') do
expect(page).to have_link(_("Create issue to resolve all threads"), href: new_project_issue_path(project, merge_request_to_resolve_discussions_of: merge_request.iid))
end
end
context 'resolving the thread' do
before do
find('button[data-testid="resolve-discussion-button"]').click
end
it 'hides the link for creating a new issue' do
expect(page).not_to have_selector resolve_all_discussions_link_selector
expect(page).not_to have_content "Create issue to resolve all threads"
end
end
context 'creating an issue for threads' do
before do
find('.discussions-counter .dropdown-toggle').click
find(resolve_all_discussions_link_selector).click
end
it_behaves_like 'creating an issue for a thread'
end
context 'for a project where all threads need to be resolved before merging' do
before do
project.update_attribute(:only_allow_merge_if_all_discussions_are_resolved, true)
end
context 'with the internal tracker disabled' do
before do
project.project_feature.update_attribute(:issues_access_level, ProjectFeature::DISABLED)
visit project_merge_request_path(project, merge_request)
end
it 'does not show a link to create a new issue' do
expect(page).not_to have_link 'Create issue to resolve all threads'
end
end
context 'merge request has threads that need to be resolved' do
before do
visit project_merge_request_path(project, merge_request)
end
it 'shows a warning that the merge request contains unresolved threads' do
expect(page).to have_content 'all threads must be resolved'
end
it 'has a link to resolve all threads by creating an issue' do
expect(page).to have_link 'Create issue to resolve all threads', href: new_project_issue_path(project, merge_request_to_resolve_discussions_of: merge_request.iid)
end
context 'creating an issue for threads' do
before do
page.within '.mr-state-widget' do
page.click_link 'Create issue to resolve all threads', href: new_project_issue_path(project, merge_request_to_resolve_discussions_of: merge_request.iid)
wait_for_all_requests
end
end
it_behaves_like 'creating an issue for a thread'
end
end
end
end
describe 'as a reporter' do
before do
project.add_reporter(user)
sign_in user
visit new_project_issue_path(project, merge_request_to_resolve_discussions_of: merge_request.iid)
end
it 'shows a notice to ask someone else to resolve the threads' do
expect(page).to have_content("The threads at #{merge_request.to_reference} will stay unresolved. Ask someone with permission to resolve them.")
end
end
end
|
