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
|
# frozen_string_literal: true
module QA
RSpec.describe 'Create' do
describe 'Merge request push options', product_group: :code_review do
# If run locally on GDK, push options need to be enabled on the host with the following command:
#
# git config --global receive.advertisepushoptions true
let(:branch) { "push-options-test-#{SecureRandom.hex(8)}" }
let(:title) { "MR push options test #{SecureRandom.hex(8)}" }
let(:project) do
Resource::Project.fabricate_via_api! do |project|
project.name = 'merge-request-push-options'
project.initialize_with_readme = true
end
end
let!(:runner) do
Resource::Runner.fabricate! do |runner|
runner.project = project
runner.name = "runner-for-#{project.name}"
runner.tags = ["runner-for-#{project.name}"]
end
end
after do |example|
runner.remove_via_api!
project.remove_via_api! unless example.exception
end
it 'sets merge when pipeline succeeds', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347843' do
Resource::Repository::Commit.fabricate_via_api! do |commit|
commit.project = project
commit.commit_message = 'Add .gitlab-ci.yml'
commit.add_files(
[
{
file_path: '.gitlab-ci.yml',
content: <<~YAML
no-op:
tags:
- "runner-for-#{project.name}"
script: sleep 999 # Leave the pipeline pending
YAML
}
]
)
end
Resource::Repository::ProjectPush.fabricate! do |push|
push.project = project
push.branch_name = branch
push.merge_request_push_options = {
create: true,
merge_when_pipeline_succeeds: true,
title: title
}
end
merge_request = project.merge_request_with_title(title)
expect(merge_request).not_to be_nil, "There was a problem creating the merge request"
merge_request = Resource::MergeRequest.fabricate_via_api! do |mr|
mr.project = project
mr.iid = merge_request[:iid]
end
aggregate_failures do
expect(merge_request.state).to eq('opened')
expect(merge_request.merge_when_pipeline_succeeds).to be true
end
end
it 'merges when pipeline succeeds', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347842' do
Resource::Repository::Commit.fabricate_via_api! do |commit|
commit.project = project
commit.commit_message = 'Add .gitlab-ci.yml'
commit.add_files(
[
{
file_path: '.gitlab-ci.yml',
content: <<~YAML
no-op:
tags:
- "runner-for-#{project.name}"
script: echo 'OK'
YAML
}
]
)
end
Resource::Repository::ProjectPush.fabricate! do |push|
push.project = project
push.branch_name = branch
push.merge_request_push_options = {
create: true,
merge_when_pipeline_succeeds: true,
title: title
}
end
merge_request = project.merge_request_with_title(title)
expect(merge_request).not_to be_nil, "There was a problem creating the merge request"
expect(merge_request[:merge_when_pipeline_succeeds]).to be true
mr = nil
begin
merge_request = Support::Retrier.retry_until(max_duration: 60, sleep_interval: 5, message: 'The merge request was not merged') do
mr = Resource::MergeRequest.fabricate_via_api! do |mr|
mr.project = project
mr.iid = merge_request[:iid]
end
next unless mr.state == 'merged'
mr
end
rescue Support::Repeater::WaitExceededError
QA::Runtime::Logger.debug("MR: #{mr.api_response}")
raise
end
expect(merge_request.state).to eq('merged')
end
end
end
end
|
