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
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
|
# frozen_string_literal: true
require 'spec_helper'
RSpec.describe Issues::ResolveDiscussions, feature_category: :team_planning do
let(:project) { create(:project, :repository) }
let(:user) { create(:user) }
before do
stub_const('DummyService', Class.new(Issues::BaseService))
DummyService.class_eval do
include ::Issues::ResolveDiscussions
def initialize(container:, current_user: nil, params: {})
super
filter_resolve_discussion_params
end
end
project.add_developer(user)
end
describe "for resolving discussions" do
let(:discussion) { create(:diff_note_on_merge_request, project: project, note: "Almost done").to_discussion }
let(:merge_request) { discussion.noteable }
let(:other_merge_request) { create(:merge_request, source_project: project, source_branch: "fix") }
describe "#merge_request_for_resolving_discussion" do
let(:service) { DummyService.new(container: project, current_user: user, params: { merge_request_to_resolve_discussions_of: merge_request.iid }) }
it "finds the merge request" do
expect(service.merge_request_to_resolve_discussions_of).to eq(merge_request)
end
it "only queries for the merge request once" do
fake_finder = double
expect(fake_finder).to receive(:find_by).exactly(1)
expect(MergeRequestsFinder).to receive(:new).and_return(fake_finder).exactly(1)
2.times { service.merge_request_to_resolve_discussions_of }
end
end
describe "#discussions_to_resolve" do
it "contains a single discussion when matching merge request and discussion are passed" do
service = DummyService.new(
container: project,
current_user: user,
params: {
discussion_to_resolve: discussion.id,
merge_request_to_resolve_discussions_of: merge_request.iid
}
)
# We need to compare discussion id's because the Discussion-objects are rebuilt
# which causes the object-id's not to be different.
discussion_ids = service.discussions_to_resolve.map(&:id)
expect(discussion_ids).to contain_exactly(discussion.id)
end
it "contains all discussions when only a merge request is passed" do
second_discussion = Discussion.new([
create(
:diff_note_on_merge_request,
noteable: merge_request,
project: merge_request.target_project,
line_number: 15
)
])
service = DummyService.new(
container: project,
current_user: user,
params: { merge_request_to_resolve_discussions_of: merge_request.iid }
)
# We need to compare discussion id's because the Discussion-objects are rebuilt
# which causes the object-id's not to be different.
discussion_ids = service.discussions_to_resolve.map(&:id)
expect(discussion_ids).to contain_exactly(discussion.id, second_discussion.id)
end
it "contains only unresolved discussions" do
_second_discussion = Discussion.new([
create(
:diff_note_on_merge_request,
:resolved,
noteable: merge_request,
project: merge_request.target_project,
line_number: 15
)
])
service = DummyService.new(
container: project,
current_user: user,
params: { merge_request_to_resolve_discussions_of: merge_request.iid }
)
# We need to compare discussion id's because the Discussion-objects are rebuilt
# which causes the object-id's not to be different.
discussion_ids = service.discussions_to_resolve.map(&:id)
expect(discussion_ids).to contain_exactly(discussion.id)
end
it "contains only non-confidential discussions" do
_second_discussion = Discussion.new([
create(
:discussion_note_on_merge_request,
:confidential,
noteable: merge_request,
project: merge_request.target_project
)
])
service = DummyService.new(
container: project,
current_user: user,
params: { merge_request_to_resolve_discussions_of: merge_request.iid }
)
# We need to compare discussion id's because the Discussion-objects are rebuilt
# which causes the object-id's not to be different.
discussion_ids = service.discussions_to_resolve.map(&:id)
expect(discussion_ids).to contain_exactly(discussion.id)
end
it "is empty when the discussion is confidential" do
second_discussion = Discussion.new([
create(
:discussion_note_on_merge_request,
:confidential,
noteable: merge_request,
project: merge_request.target_project
)
])
service = DummyService.new(
container: project,
current_user: user,
params: {
discussion_to_resolve: second_discussion.id,
merge_request_to_resolve_discussions_of: merge_request.iid
}
)
expect(service.discussions_to_resolve).to be_empty
end
it "is empty when a discussion and another merge request are passed" do
service = DummyService.new(
container: project,
current_user: user,
params: {
discussion_to_resolve: discussion.id,
merge_request_to_resolve_discussions_of: other_merge_request.iid
}
)
expect(service.discussions_to_resolve).to be_empty
end
end
end
end
|
