blob: e02d32bc4c7619186a21916e1ccbb1abfcf9c4e0 (
plain)
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
|
# frozen_string_literal: true
module QA
RSpec.describe 'Create' do
describe 'Merge request push options' 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(: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
it 'sets a target branch', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/issues/1034' do
target_branch = "push-options-test-target-#{SecureRandom.hex(8)}"
Resource::Repository::ProjectPush.fabricate! do |push|
push.project = project
push.branch_name = target_branch
push.file_content = "Target branch test target branch #{SecureRandom.hex(8)}"
end
# Confirm the target branch can be checked out to avoid a race condition
# where the subsequent push option attempts to create an MR before the target branch is ready.
Support::Retrier.retry_on_exception(sleep_interval: 5) do
Git::Repository.perform do |repository|
repository.uri = project.repository_http_location.uri
repository.use_default_credentials
repository.clone
repository.configure_identity('GitLab QA', 'root@gitlab.com')
repository.checkout(target_branch)
end
end
Resource::Repository::ProjectPush.fabricate! do |push|
push.project = project
push.branch_name = "push-options-test-#{SecureRandom.hex(8)}"
push.file_content = "Target branch test source branch #{SecureRandom.hex(8)}"
push.merge_request_push_options = {
create: true,
title: title,
target: target_branch
}
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[:target_branch]).to eq(target_branch)
merge_request = Resource::MergeRequest.fabricate_via_api! do |mr|
mr.project = project
mr.id = merge_request[:iid]
end.merge_via_api!
expect(merge_request[:state]).to eq('merged')
end
end
end
end
|
