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
|
require 'spec_helper'
feature 'Only allow merge requests to be merged if the build succeeds', feature: true, js: true do
let(:user) { create(:user) }
let(:project) { create(:project, :public) }
let(:merge_request) { create(:merge_request_with_diffs, source_project: project, author: user) }
before do
login_as user
project.team << [user, :master]
end
context "project hasn't ci enabled" do
it "allows MR to be merged" do
visit_merge_request(merge_request)
expect(page).to have_button "Accept Merge Request"
end
end
context "when project has ci enabled" do
let!(:ci_commit) { create(:ci_commit, project: project, sha: merge_request.last_commit.id, ref: merge_request.source_branch) }
let!(:ci_build) { create(:ci_build, commit: ci_commit) }
before do
project.enable_ci
end
context "when merge requests can only be merged if the build succeeds" do
before do
project.update_attribute(:only_allow_merge_if_build_succeeds, true)
end
context "when ci is running" do
it "doesn't allow to merge immediately" do
ci_commit.statuses.update_all(status: :pending)
visit_merge_request(merge_request)
expect(page).to have_button "Merge When Build Succeeds"
expect(page).to_not have_button "Select Merge Moment"
end
end
context "when ci failed" do
it "doesn't allow MR to be merged" do
ci_commit.statuses.update_all(status: :failed)
visit_merge_request(merge_request)
expect(page).to_not have_button "Accept Merge Request"
expect(page).to have_content("Please retry the build or push code to fix the failure.")
end
end
context "when ci succeed" do
it "allows MR to be merged" do
ci_commit.statuses.update_all(status: :success)
visit_merge_request(merge_request)
expect(page).to have_button "Accept Merge Request"
end
end
end
context "when merge requests can be merged when the build failed" do
before do
project.update_attribute(:only_allow_merge_if_build_succeeds, false)
end
context "when ci is running" do
it "allows MR to be merged immediately" do
ci_commit.statuses.update_all(status: :pending)
visit_merge_request(merge_request)
expect(page).to have_button "Merge When Build Succeeds"
click_button "Select Merge Moment"
expect(page).to have_content "Merge Immediately"
end
end
context "when ci failed" do
it "allows MR to be merged" do
ci_commit.statuses.update_all(status: :failed)
visit_merge_request(merge_request)
expect(page).to have_button "Accept Merge Request"
end
end
context "when ci succeed" do
it "allows MR to be merged" do
ci_commit.statuses.update_all(status: :success)
visit_merge_request(merge_request)
expect(page).to have_button "Accept Merge Request"
end
end
end
end
def visit_merge_request(merge_request)
visit namespace_project_merge_request_path(merge_request.project.namespace, merge_request.project, merge_request)
end
end
|
