-
Notifications
You must be signed in to change notification settings - Fork 283
Expand file tree
/
Copy pathpost_merge_spec.rb
More file actions
254 lines (218 loc) · 7.18 KB
/
Copy pathpost_merge_spec.rb
File metadata and controls
254 lines (218 loc) · 7.18 KB
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
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
# frozen_string_literal: true
require 'spec_helper'
require 'overcommit/hook_context/post_merge'
describe Overcommit::HookContext::PostMerge do
let(:config) { double('config') }
let(:args) { [] }
let(:input) { double('input') }
let(:context) { described_class.new(config, args, input) }
describe '#squash?' do
subject { context.squash? }
context 'when the merge is made using --squash' do
let(:args) { [1] }
around do |example|
repo do
`git commit --allow-empty -m "Initial commit"`
`git checkout -b child > #{File::NULL} 2>&1`
`git commit --allow-empty -m "Branch commit"`
`git checkout master > #{File::NULL} 2>&1`
`git merge --squash child`
example.run
end
end
it { should == true }
end
context 'when the merge is made without --squash' do
around do |example|
repo do
`git commit --allow-empty -m "Initial commit"`
`git checkout -b child > #{File::NULL} 2>&1`
`git commit --allow-empty -m "Branch commit"`
`git checkout master > #{File::NULL} 2>&1`
`git merge --no-ff --no-edit child`
example.run
end
end
it { should == false }
end
end
describe '#merge_commit?' do
subject { context.merge_commit? }
context 'when the merge is made using --squash' do
let(:args) { [1] }
around do |example|
repo do
`git commit --allow-empty -m "Initial commit"`
`git checkout -b child > #{File::NULL} 2>&1`
`git commit --allow-empty -m "Branch commit"`
`git checkout master > #{File::NULL} 2>&1`
`git merge --squash child`
example.run
end
end
it { should == false }
end
context 'when the merge is made without --squash' do
around do |example|
repo do
`git commit --allow-empty -m "Initial commit"`
`git checkout -b child > #{File::NULL} 2>&1`
`git commit --allow-empty -m "Branch commit"`
`git checkout master > #{File::NULL} 2>&1`
`git merge --no-ff --no-edit child`
example.run
end
end
it { should == true }
end
end
describe '#modified_files' do
subject { context.modified_files }
it 'does not include submodules' do
submodule = repo do
touch 'foo'
`git add foo`
`git commit -m "Initial commit"`
end
repo do
`git commit --allow-empty -m "Initial commit"`
`git checkout -b child > #{File::NULL} 2>&1`
`git submodule add #{submodule} test-sub 2>&1 > #{File::NULL}`
`git commit -m "Add submodule"`
`git checkout master > #{File::NULL} 2>&1`
`git merge --no-ff --no-edit child`
expect(subject).to_not include File.expand_path('test-sub')
end
end
context 'when no files were staged' do
around do |example|
repo do
`git commit --allow-empty -m "Initial commit"`
`git checkout -b child > #{File::NULL} 2>&1`
`git commit --allow-empty -m "Branch commit"`
`git checkout master > #{File::NULL} 2>&1`
`git merge --no-ff --no-edit child`
example.run
end
end
it { should be_empty }
end
context 'when files were added' do
around do |example|
repo do
`git commit --allow-empty -m "Initial commit"`
`git checkout -b child > #{File::NULL} 2>&1`
touch('some-file')
`git add some-file`
`git commit -m "Branch commit"`
`git checkout master > #{File::NULL} 2>&1`
`git merge --no-ff --no-edit child`
example.run
end
end
it { should == [File.expand_path('some-file')] }
end
context 'when files were modified' do
around do |example|
repo do
touch('some-file')
`git add some-file`
`git commit -m "Initial commit"`
`git checkout -b child > #{File::NULL} 2>&1`
echo('Hello', 'some-file')
`git add some-file`
`git commit -m "Branch commit"`
`git checkout master > #{File::NULL} 2>&1`
`git merge --no-ff --no-edit child`
example.run
end
end
it { should == [File.expand_path('some-file')] }
end
context 'when files were deleted' do
around do |example|
repo do
touch('some-file')
`git add some-file`
`git commit -m "Initial commit"`
`git checkout -b child > #{File::NULL} 2>&1`
`git rm some-file`
`git commit -m "Branch commit"`
`git checkout master > #{File::NULL} 2>&1`
`git merge --no-ff --no-edit child`
example.run
end
end
it { should be_empty }
end
context 'when the merge is made using --squash' do
let(:args) { [1] }
around do |example|
repo do
`git commit --allow-empty -m "Initial commit"`
`git checkout -b child > #{File::NULL} 2>&1`
touch('some-file')
`git add some-file`
`git commit -m "Branch commit"`
`git checkout master > #{File::NULL} 2>&1`
`git merge --squash child`
example.run
end
end
it { should == [File.expand_path('some-file')] }
end
end
describe '#modified_lines_in_file' do
let(:modified_file) { 'some-file' }
subject { context.modified_lines_in_file(modified_file) }
context 'when file contains a trailing newline' do
around do |example|
repo do
`git commit --allow-empty -m "Initial commit"`
`git checkout -b child > #{File::NULL} 2>&1`
File.open(modified_file, 'w') { |f| (1..3).each { |i| f.write("#{i}\n") } }
`git add #{modified_file}`
`git commit -m "Branch commit"`
`git checkout master > #{File::NULL} 2>&1`
`git merge --no-ff --no-edit child`
example.run
end
end
it { should == Set.new(1..3) }
end
context 'when file does not contain a trailing newline' do
around do |example|
repo do
`git commit --allow-empty -m "Initial commit"`
`git checkout -b child > #{File::NULL} 2>&1`
File.open(modified_file, 'w') do |f|
(1..2).each { |i| f.write("#{i}\n") }
f.write(3)
end
`git add #{modified_file}`
`git commit -m "Branch commit"`
`git checkout master > #{File::NULL} 2>&1`
`git merge --no-ff --no-edit child`
example.run
end
end
it { should == Set.new(1..3) }
end
context 'when the merge is made using --squash' do
let(:args) { [1] }
around do |example|
repo do
`git commit --allow-empty -m "Initial commit"`
`git checkout -b child > #{File::NULL} 2>&1`
File.open(modified_file, 'w') { |f| (1..3).each { |i| f.write("#{i}\n") } }
`git add #{modified_file}`
`git commit -m "Branch commit"`
`git checkout master > #{File::NULL} 2>&1`
`git merge --squash child`
example.run
end
end
it { should == Set.new(1..3) }
end
end
end