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
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
|
# frozen_string_literal: true
require 'spec_helper'
RSpec.describe 'Merge request > User merges only if pipeline succeeds', :js, feature_category: :code_review_workflow do
let(:merge_request) { create(:merge_request_with_diffs) }
let(:project) { merge_request.target_project }
before do
project.add_maintainer(merge_request.author)
sign_in(merge_request.author)
end
context 'project does not have CI enabled' do
it 'allows MR to be merged' do
stub_feature_flags(auto_merge_labels_mr_widget: false)
visit project_merge_request_path(project, merge_request)
wait_for_requests
page.within('.mr-state-widget') do
expect(page).to have_button 'Merge'
end
end
end
context 'project does not have CI enabled and auto_merge_labels_mr_widget on' do
it 'allows MR to be merged' do
stub_feature_flags(auto_merge_labels_mr_widget: true)
visit project_merge_request_path(project, merge_request)
wait_for_requests
page.within('.mr-state-widget') do
expect(page).to have_button 'Merge'
end
end
end
context 'when project has CI enabled' do
let!(:pipeline) do
create(:ci_empty_pipeline,
project: project,
sha: merge_request.diff_head_sha,
ref: merge_request.source_branch,
status: status, head_pipeline_of: merge_request)
end
context 'when merge requests can only be merged if the pipeline succeeds' do
before do
project.update_attribute(:only_allow_merge_if_pipeline_succeeds, true)
stub_feature_flags(auto_merge_labels_mr_widget: false)
end
context 'when CI is running' do
let(:status) { :running }
it 'does not allow to merge immediately' do
visit project_merge_request_path(project, merge_request)
wait_for_requests
expect(page).to have_button 'Merge when pipeline succeeds'
expect(page).not_to have_button '.js-merge-moment'
end
end
context 'when CI failed' do
let(:status) { :failed }
it 'does not allow MR to be merged' do
visit project_merge_request_path(project, merge_request)
wait_for_requests
expect(page).not_to have_button('Merge', exact: true)
expect(page).to have_content('Merge blocked: pipeline must succeed. Push a commit that fixes the failure or learn about other solutions.')
end
end
context 'when CI canceled' do
let(:status) { :canceled }
it 'does not allow MR to be merged' do
visit project_merge_request_path(project, merge_request)
wait_for_requests
expect(page).not_to have_button('Merge', exact: true)
expect(page).to have_content('Merge blocked: pipeline must succeed. Push a commit that fixes the failure or learn about other solutions.')
end
end
context 'when CI succeeded' do
let(:status) { :success }
it 'allows MR to be merged' do
visit project_merge_request_path(project, merge_request)
wait_for_requests
expect(page).to have_button('Merge', exact: true)
end
end
context 'when CI skipped' do
let(:status) { :skipped }
it 'does not allow MR to be merged' do
visit project_merge_request_path(project, merge_request)
wait_for_requests
expect(page).not_to have_button('Merge', exact: true)
end
end
end
context 'when merge requests can only be merged if the pipeline succeeds with auto_merge_labels_mr_widget on' do
before do
project.update_attribute(:only_allow_merge_if_pipeline_succeeds, true)
stub_feature_flags(auto_merge_labels_mr_widget: true)
end
context 'when CI is running' do
let(:status) { :running }
it 'does not allow to merge immediately' do
visit project_merge_request_path(project, merge_request)
wait_for_requests
expect(page).to have_button 'Set to auto-merge'
expect(page).not_to have_button '.js-merge-moment'
end
end
context 'when CI failed' do
let(:status) { :failed }
it 'does not allow MR to be merged' do
visit project_merge_request_path(project, merge_request)
wait_for_requests
expect(page).not_to have_button('Merge', exact: true)
expect(page).to have_content('Merge blocked: pipeline must succeed. Push a commit that fixes the failure or learn about other solutions.')
end
end
context 'when CI canceled' do
let(:status) { :canceled }
it 'does not allow MR to be merged' do
visit project_merge_request_path(project, merge_request)
wait_for_requests
expect(page).not_to have_button('Merge', exact: true)
expect(page).to have_content('Merge blocked: pipeline must succeed. Push a commit that fixes the failure or learn about other solutions.')
end
end
context 'when CI succeeded' do
let(:status) { :success }
it 'allows MR to be merged' do
visit project_merge_request_path(project, merge_request)
wait_for_requests
expect(page).to have_button('Merge', exact: true)
end
end
context 'when CI skipped' do
let(:status) { :skipped }
it 'does not allow MR to be merged' do
visit project_merge_request_path(project, merge_request)
wait_for_requests
expect(page).not_to have_button('Merge', exact: true)
end
end
end
context 'when merge requests can be merged when the build failed' do
before do
project.update_attribute(:only_allow_merge_if_pipeline_succeeds, false)
stub_feature_flags(auto_merge_labels_mr_widget: false)
end
context 'when CI is running' do
let(:status) { :running }
it 'allows MR to be merged immediately' do
visit project_merge_request_path(project, merge_request)
wait_for_requests
expect(page).to have_button 'Merge when pipeline succeeds'
page.find('.js-merge-moment').click
expect(page).to have_content 'Merge immediately'
end
end
context 'when CI failed' do
let(:status) { :failed }
it 'allows MR to be merged' do
visit project_merge_request_path(project, merge_request)
wait_for_requests
page.within('.mr-state-widget') do
expect(page).to have_button 'Merge'
end
end
end
context 'when CI succeeded' do
let(:status) { :success }
it 'allows MR to be merged' do
visit project_merge_request_path(project, merge_request)
wait_for_requests
page.within('.mr-state-widget') do
expect(page).to have_button 'Merge'
end
end
end
end
context 'when merge requests can be merged when the build failed with auto_merge_labels_mr_widget on' do
before do
project.update_attribute(:only_allow_merge_if_pipeline_succeeds, false)
stub_feature_flags(auto_merge_labels_mr_widget: true)
end
context 'when CI is running' do
let(:status) { :running }
it 'allows MR to be merged immediately' do
visit project_merge_request_path(project, merge_request)
wait_for_requests
expect(page).to have_button 'Set to auto-merge'
page.find('.js-merge-moment').click
expect(page).to have_content 'Merge immediately'
end
end
context 'when CI failed' do
let(:status) { :failed }
it 'allows MR to be merged' do
visit project_merge_request_path(project, merge_request)
wait_for_requests
page.within('.mr-state-widget') do
expect(page).to have_button 'Merge'
end
end
end
context 'when CI succeeded' do
let(:status) { :success }
it 'allows MR to be merged' do
visit project_merge_request_path(project, merge_request)
wait_for_requests
page.within('.mr-state-widget') do
expect(page).to have_button 'Merge'
end
end
end
end
end
end
|
