forked from remotemobprogramming/mob
-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy pathsquash_wip_test.go
More file actions
299 lines (221 loc) · 7.45 KB
/
squash_wip_test.go
File metadata and controls
299 lines (221 loc) · 7.45 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
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
package main
import (
"fmt"
"io/ioutil"
"os"
"testing"
)
func TestSquashWipCommits_acceptance(t *testing.T) {
_, configuration := setup(t)
// change without manual commit
start(configuration)
createFile(t, "file1.txt", "irrelevant")
next(configuration)
// change with a manual commit
start(configuration)
createFileAndCommitIt(t, "file2.txt", "irrelevant", "first manual commit")
next(configuration)
// change with a manual commit followed by an uncommited change
start(configuration)
createFileAndCommitIt(t, "file3.txt", "irrelevant", "second manual commit")
createFile(t, "file4.txt", "irrelevant")
next(configuration)
// change with a final manual commit
start(configuration)
createFileAndCommitIt(t, "file5.txt", "irrelevant", "third manual commit")
squashWip(configuration)
assertOnBranch(t, "mob-session")
equals(t, []string{
"third manual commit",
"second manual commit",
"first manual commit",
}, commitsOnCurrentBranch(configuration))
}
func TestSquashWipCommits_resetsEnv(t *testing.T) {
_, configuration := setup(t)
start(configuration)
createFileAndCommitIt(t, "file1.txt", "irrelevant", "new file")
originalGitEditor := "irrelevant"
originalGitSequenceEditor := "irrelevant, too"
os.Setenv("GIT_EDITOR", originalGitEditor)
os.Setenv("GIT_SEQUENCE_EDITOR", originalGitSequenceEditor)
squashWip(configuration)
equals(t, originalGitEditor, os.Getenv("GIT_EDITOR"))
equals(t, originalGitSequenceEditor, os.Getenv("GIT_SEQUENCE_EDITOR"))
}
func TestSquashWipCommits_failsOnFinalWipCommit(t *testing.T) {
output, configuration := setup(t)
start(configuration)
createFile(t, "file2.txt", "irrelevant")
next(configuration)
start(configuration)
squashWip(configuration)
assertCommitLogContainsMessage(t, gitCurrentBranch().Name, configuration.WipCommitMessage)
assertOutputContains(t, output, "failed to squash wip commits")
}
func TestSquashWipCommits_failsOnMainBranch(t *testing.T) {
output, configuration := setup(t)
squashWip(configuration)
assertOutputContains(t, output, "to start working together")
}
func TestSquashWipCommits_worksWithEmptyCommits(t *testing.T) {
_, configuration := setup(t)
// change without manual commit
start(configuration)
createFile(t, "file1.txt", "irrelevant")
next(configuration)
start(configuration)
silentgit("commit", "--allow-empty", "-m ok")
squashWip(configuration)
assertOnBranch(t, "mob-session")
equals(t, []string{
"ok",
}, commitsOnCurrentBranch(configuration))
}
func TestCommitsOnCurrentBranch(t *testing.T) {
_, configuration := setup(t)
createFileAndCommitIt(t, "file1.txt", "irrelevant", "not on branch")
silentgit("push")
start(configuration)
createFileAndCommitIt(t, "file2.txt", "irrelevant", "on branch")
createFile(t, "file3.txt", "irrelevant")
next(configuration)
start(configuration)
commits := commitsOnCurrentBranch(configuration)
equals(t, []string{
configuration.WipCommitMessage,
"on branch",
}, commits)
}
func TestEndsWithWipCommit_finalManualCommit(t *testing.T) {
_, configuration := setup(t)
start(configuration)
createFileAndCommitIt(t, "file1.txt", "irrelevant", "new file")
equals(t, false, endsWithWipCommit(configuration))
}
func TestEndsWithWipCommit_finalWipCommit(t *testing.T) {
_, configuration := setup(t)
start(configuration)
createFile(t, "file1.txt", "irrelevant")
next(configuration)
start(configuration)
equals(t, true, endsWithWipCommit(configuration))
}
func TestEndsWithWipCommit_manualThenWipCommit(t *testing.T) {
_, configuration := setup(t)
start(configuration)
createFileAndCommitIt(t, "file1.txt", "irrelevant", "new file")
createFile(t, "file2.txt", "irrelevant")
next(configuration)
start(configuration)
equals(t, true, endsWithWipCommit(configuration))
}
func TestEndsWithWipCommit_wipThenManualCommit(t *testing.T) {
_, configuration := setup(t)
start(configuration)
createFile(t, "file2.txt", "irrelevant")
next(configuration)
start(configuration)
createFileAndCommitIt(t, "file1.txt", "irrelevant", "new file")
equals(t, false, endsWithWipCommit(configuration))
}
func TestMarkSquashWip_singleManualCommit(t *testing.T) {
configuration := getDefaultConfiguration()
input := `pick c51a56d new file
# Rebase ...`
result := markPostWipCommitsForSquashing(input, configuration)
equals(t, input, result)
}
func TestMarkSquashWip_manyManualCommits(t *testing.T) {
configuration := getDefaultConfiguration()
input := `pick c51a56d new file
pick 63ef7a4 another commit
# Rebase ...`
result := markPostWipCommitsForSquashing(input, configuration)
equals(t, input, result)
}
func TestMarkSquashWip_wipCommitFollowedByManualCommit(t *testing.T) {
configuration := getDefaultConfiguration()
input := fmt.Sprintf(`pick 01a9a31 %s
pick c51a56d manual commit
# Rebase ...`, configuration.WipCommitMessage)
expected := fmt.Sprintf(`pick 01a9a31 %s
squash c51a56d manual commit
# Rebase ...`, configuration.WipCommitMessage)
result := markPostWipCommitsForSquashing(input, configuration)
equals(t, expected, result)
}
func TestMarkSquashWip_manyWipCommitsFollowedByManualCommit(t *testing.T) {
configuration := getDefaultConfiguration()
input := fmt.Sprintf(`pick 01a9a31 %[1]s
pick 01a9a32 %[1]s
pick 01a9a33 %[1]s
pick c51a56d manual commit
# Rebase ...`, configuration.WipCommitMessage)
expected := fmt.Sprintf(`pick 01a9a31 %[1]s
squash 01a9a32 %[1]s
squash 01a9a33 %[1]s
squash c51a56d manual commit
# Rebase ...`, configuration.WipCommitMessage)
result := markPostWipCommitsForSquashing(input, configuration)
equals(t, expected, result)
}
func TestCommentWipCommits_oneWipAndOneManualCommit(t *testing.T) {
configuration := getDefaultConfiguration()
input := fmt.Sprintf(`# This is a combination of 2 commits.
# This is the 1st commit message:
%s
# This is the commit message #2:
manual commit
# Please enter ...`, configuration.WipCommitMessage)
expected := fmt.Sprintf(`# This is a combination of 2 commits.
# This is the 1st commit message:
# %s
# This is the commit message #2:
manual commit
# Please enter ...`, configuration.WipCommitMessage)
result := commentWipCommits(input, configuration)
equals(t, expected, result)
}
func TestSquashWipCommitGitEditor(t *testing.T) {
configuration := getDefaultConfiguration()
createTestbed(t, configuration)
input := createFile(t, "commits", fmt.Sprintf(
`# This is a combination of 2 commits.
# This is the 1st commit message:
%s
# This is the commit message #2:
new file
# Please enter the commit message for your changes. Lines starting`, configuration.WipCommitMessage))
expected := fmt.Sprintf(
`# This is a combination of 2 commits.
# This is the 1st commit message:
# %s
# This is the commit message #2:
new file
# Please enter the commit message for your changes. Lines starting`, configuration.WipCommitMessage)
squashWipGitEditor(input, getDefaultConfiguration())
result, _ := ioutil.ReadFile(input)
equals(t, expected, string(result))
}
func TestSquashWipCommitGitSequenceEditor(t *testing.T) {
configuration := getDefaultConfiguration()
createTestbed(t, configuration)
input := createFile(t, "rebase", fmt.Sprintf(
`pick 01a9a31 %[1]s
pick 01a9a32 %[1]s
pick 01a9a33 %[1]s
pick c51a56d manual commit
# Rebase ...
`, configuration.WipCommitMessage))
expected := fmt.Sprintf(
`pick 01a9a31 %[1]s
squash 01a9a32 %[1]s
squash 01a9a33 %[1]s
squash c51a56d manual commit
# Rebase ...
`, configuration.WipCommitMessage)
squashWipGitSequenceEditor(input, getDefaultConfiguration())
result, _ := ioutil.ReadFile(input)
equals(t, expected, string(result))
}