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
|
# frozen_string_literal: true
require 'spec_helper'
RSpec.describe Commits::CommitPatchService, feature_category: :source_code_management do
describe '#execute' do
let(:patches) do
patches_folder = Rails.root.join('spec/fixtures/patchfiles')
content_1 = File.read(File.join(patches_folder, "0001-This-does-not-apply-to-the-feature-branch.patch"))
content_2 = File.read(File.join(patches_folder, "0001-A-commit-from-a-patch.patch"))
[content_1, content_2]
end
let(:user) { project.creator }
let(:branch_name) { 'branch-with-patches' }
let(:project) { create(:project, :repository) }
let(:start_branch) { nil }
let(:params) do
{
branch_name: branch_name,
patches: patches,
start_branch: start_branch
}
end
subject(:service) do
described_class.new(project, user, params)
end
it 'returns a successful result' do
result = service.execute
branch = project.repository.find_branch(branch_name)
expect(result[:status]).to eq(:success)
expect(result[:result]).to eq(branch.target)
end
it 'is based off HEAD when no start ref is passed' do
service.execute
merge_base = project.repository.merge_base(project.repository.root_ref, branch_name)
expect(merge_base).to eq(project.repository.commit('HEAD').sha)
end
context 'when specifying a different start branch' do
let(:start_branch) { 'with-codeowners' }
it 'is based of the correct branch' do
service.execute
merge_base = project.repository.merge_base(start_branch, branch_name)
expect(merge_base).to eq(project.repository.commit(start_branch).sha)
end
end
shared_examples 'an error response' do |expected_message|
it 'returns the correct error' do
result = service.execute
expect(result[:status]).to eq(:error)
expect(result[:message]).to match(expected_message)
end
end
context 'when the user does not have access' do
let(:user) { create(:user) }
it_behaves_like 'an error response', 'You are not allowed to push into this branch'
end
context 'when the patches are not valid' do
let(:patches) { "a" * 2.1.megabytes }
it_behaves_like 'an error response', 'Patches are too big'
end
context 'when the new branch name is invalid' do
let(:branch_name) { 'HEAD' }
it_behaves_like 'an error response', 'Branch name is invalid'
end
context 'when the patches do not apply' do
let(:branch_name) { 'feature' }
it_behaves_like 'an error response', 'Patch failed at'
end
context 'when specifying a non existent start branch' do
let(:start_branch) { 'does-not-exist' }
it_behaves_like 'an error response', 'Failed to create branch'
end
context 'with target_sha' do
let(:commit_patches_double) { instance_double("Gitlab::Git::Patches::CommitPatches") }
before do
allow(commit_patches_double).to receive(:commit).and_return(true)
end
context 'when start_branch is nil' do
it 'passes a nil target_sha argument when no start_branch is passed' do
expect(Gitlab::Git::Patches::CommitPatches)
.to receive(:new)
.with(user, project.repository, branch_name, instance_of(Gitlab::Git::Patches::Collection), nil)
.and_return(commit_patches_double)
service.execute
end
end
context 'when start_branch is given' do
let(:start_branch) { 'with-codeowners' }
context 'and a valid target_sha is retrieved' do
it 'calls Gitlab::Git::Patches::CommitPatches with no errors' do
target_sha = project.repository.commit(start_branch).sha
expect(Gitlab::Git::Patches::CommitPatches)
.to receive(:new)
.with(user, project.repository, branch_name, instance_of(Gitlab::Git::Patches::Collection), target_sha)
.and_return(commit_patches_double)
service.execute
end
end
context 'and an invalid target_sha is retrieved' do
before do
allow(project.repository)
.to receive_message_chain(:commit, :sha)
.and_return("2df2bff3c5d39d69c49c947a6972212731e8146f")
end
it_behaves_like 'an error response',
"13:expected old object cannot be resolved: reference not found."
end
end
end
end
end
|
