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
|
require 'rails_helper'
describe 'Merge request > User merges only if pipeline succeeds', :js 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
visit project_merge_request_path(project, merge_request)
wait_for_requests
expect(page).to have_button 'Merge'
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)
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).to have_css('button[disabled="disabled"]', text: 'Merge')
expect(page).to have_content('Please retry the job or push a new commit to fix the failure')
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'
expect(page).to have_content('Please retry the job or push a new commit to fix the failure')
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'
end
end
context 'when CI skipped' do
let(:status) { :skipped }
it 'allows MR to be merged' do
visit project_merge_request_path(project, merge_request)
wait_for_requests
expect(page).to have_button 'Merge'
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)
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
expect(page).to have_button 'Merge'
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'
end
end
end
end
end
|
