-
-
Notifications
You must be signed in to change notification settings - Fork 334
Expand file tree
/
Copy pathtest_commit_command.py
More file actions
594 lines (463 loc) · 19.4 KB
/
test_commit_command.py
File metadata and controls
594 lines (463 loc) · 19.4 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
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
from pathlib import Path
from unittest.mock import ANY
import pytest
from pytest_mock import MockFixture, MockType
from commitizen import cmd, commands
from commitizen.cz.exceptions import CzException
from commitizen.cz.utils import get_backup_file_path
from commitizen.exceptions import (
CommitError,
CommitMessageLengthExceededError,
CustomError,
DryRunExit,
NoAnswersError,
NoCommitBackupError,
NotAGitProjectError,
NotAllowed,
NothingToCommitError,
)
@pytest.fixture
def commit_mock(mocker: MockFixture):
return mocker.patch(
"commitizen.git.commit", return_value=cmd.Command("success", "", b"", b"", 0)
)
@pytest.fixture
def prompt_mock_feat(mocker: MockFixture):
return mocker.patch(
"questionary.prompt",
return_value={
"prefix": "feat",
"subject": "user created",
"scope": "",
"is_breaking_change": False,
"body": "closes #21",
"footer": "",
},
)
@pytest.fixture
def staging_is_clean(mocker: MockFixture, tmp_git_project):
mocker.patch("commitizen.git.is_staging_clean", return_value=False)
return tmp_git_project
@pytest.fixture
def backup_file(tmp_git_project):
with open(get_backup_file_path(), "w") as backup_file:
backup_file.write("backup commit")
@pytest.mark.usefixtures("staging_is_clean", "commit_mock", "prompt_mock_feat")
def test_commit(config, success_mock: MockType):
commands.Commit(config, {})()
success_mock.assert_called_once()
@pytest.mark.usefixtures("staging_is_clean")
def test_commit_backup_on_failure(
config, mocker: MockFixture, prompt_mock_feat: MockType
):
mocker.patch(
"commitizen.git.commit", return_value=cmd.Command("", "error", b"", b"", 9)
)
error_mock = mocker.patch("commitizen.out.error")
commit_cmd = commands.Commit(config, {})
temp_file = commit_cmd.backup_file_path
with pytest.raises(CommitError):
commit_cmd()
prompt_mock_feat.assert_called_once()
error_mock.assert_called_once()
assert Path(temp_file).exists()
@pytest.mark.usefixtures("staging_is_clean", "commit_mock")
def test_commit_retry_fails_no_backup(config):
with pytest.raises(NoCommitBackupError) as excinfo:
commands.Commit(config, {"retry": True})()
assert NoCommitBackupError.message in str(excinfo.value)
@pytest.mark.usefixtures("staging_is_clean", "backup_file")
def test_commit_retry_works(
config, success_mock: MockType, mocker: MockFixture, commit_mock: MockType
):
prompt_mock = mocker.patch("questionary.prompt")
commit_cmd = commands.Commit(config, {"retry": True})
temp_file = commit_cmd.backup_file_path
commit_cmd()
commit_mock.assert_called_with("backup commit", args="")
prompt_mock.assert_not_called()
success_mock.assert_called_once()
assert not Path(temp_file).exists()
@pytest.mark.usefixtures("staging_is_clean")
def test_commit_retry_after_failure_no_backup(
config, success_mock: MockType, commit_mock: MockType, prompt_mock_feat: MockType
):
config.settings["retry_after_failure"] = True
commands.Commit(config, {})()
commit_mock.assert_called_with("feat: user created\n\ncloses #21", args="")
prompt_mock_feat.assert_called_once()
success_mock.assert_called_once()
@pytest.mark.usefixtures("staging_is_clean", "backup_file")
def test_commit_retry_after_failure_works(
config, success_mock: MockType, mocker: MockFixture, commit_mock: MockType
):
prompt_mock = mocker.patch("questionary.prompt")
config.settings["retry_after_failure"] = True
commit_cmd = commands.Commit(config, {})
temp_file = commit_cmd.backup_file_path
commit_cmd()
commit_mock.assert_called_with("backup commit", args="")
prompt_mock.assert_not_called()
success_mock.assert_called_once()
assert not Path(temp_file).exists()
@pytest.mark.usefixtures("staging_is_clean", "backup_file")
def test_commit_retry_after_failure_with_no_retry_works(
config, success_mock: MockType, commit_mock: MockType, prompt_mock_feat: MockType
):
config.settings["retry_after_failure"] = True
commit_cmd = commands.Commit(config, {"no_retry": True})
temp_file = commit_cmd.backup_file_path
commit_cmd()
commit_mock.assert_called_with("feat: user created\n\ncloses #21", args="")
prompt_mock_feat.assert_called_once()
success_mock.assert_called_once()
assert not Path(temp_file).exists()
@pytest.mark.usefixtures("staging_is_clean", "prompt_mock_feat")
def test_commit_command_with_dry_run_option(config):
with pytest.raises(DryRunExit):
commands.Commit(config, {"dry_run": True})()
@pytest.mark.usefixtures("staging_is_clean", "commit_mock", "prompt_mock_feat")
def test_commit_command_with_write_message_to_file_option(
config, tmp_path, success_mock: MockType
):
tmp_file = tmp_path / "message"
commands.Commit(config, {"write_message_to_file": tmp_file})()
success_mock.assert_called_once()
assert tmp_file.exists()
assert "feat: user created" in tmp_file.read_text()
@pytest.mark.usefixtures("staging_is_clean", "prompt_mock_feat")
def test_commit_command_with_invalid_write_message_to_file_option(config, tmp_path):
with pytest.raises(NotAllowed):
commands.Commit(config, {"write_message_to_file": tmp_path})()
@pytest.mark.usefixtures("staging_is_clean", "prompt_mock_feat")
def test_commit_command_with_signoff_option(
config, success_mock: MockType, commit_mock: MockType
):
commands.Commit(config, {"signoff": True})()
commit_mock.assert_called_once_with(ANY, args="-s")
success_mock.assert_called_once()
@pytest.mark.usefixtures("staging_is_clean", "prompt_mock_feat")
def test_commit_command_with_always_signoff_enabled(
config, success_mock: MockType, commit_mock: MockType
):
config.settings["always_signoff"] = True
commands.Commit(config, {})()
commit_mock.assert_called_once_with(ANY, args="-s")
success_mock.assert_called_once()
@pytest.mark.usefixtures("staging_is_clean", "prompt_mock_feat")
def test_commit_command_with_gpgsign_and_always_signoff_enabled(
config, success_mock: MockType, commit_mock: MockType
):
config.settings["always_signoff"] = True
commands.Commit(config, {"extra_cli_args": "-S"})()
commit_mock.assert_called_once_with(ANY, args="-S -s")
success_mock.assert_called_once()
@pytest.mark.usefixtures("tmp_git_project")
def test_commit_when_nothing_to_commit(config, mocker: MockFixture):
mocker.patch("commitizen.git.is_staging_clean", return_value=True)
with pytest.raises(NothingToCommitError) as excinfo:
commands.Commit(config, {})()
assert "No files added to staging!" in str(excinfo.value)
@pytest.mark.usefixtures("staging_is_clean", "prompt_mock_feat")
def test_commit_with_allow_empty(config, success_mock: MockType, commit_mock: MockType):
commands.Commit(config, {"extra_cli_args": "--allow-empty"})()
commit_mock.assert_called_with(
"feat: user created\n\ncloses #21", args="--allow-empty"
)
success_mock.assert_called_once()
@pytest.mark.usefixtures("staging_is_clean", "prompt_mock_feat")
def test_commit_with_signoff_and_allow_empty(
config, success_mock: MockType, commit_mock: MockType
):
config.settings["always_signoff"] = True
commands.Commit(config, {"extra_cli_args": "--allow-empty"})()
commit_mock.assert_called_with(
"feat: user created\n\ncloses #21", args="--allow-empty -s"
)
success_mock.assert_called_once()
@pytest.mark.usefixtures("staging_is_clean")
def test_commit_when_customized_expected_raised(config, mocker: MockFixture):
_err = ValueError()
_err.__context__ = CzException("This is the root custom err")
mocker.patch("questionary.prompt", side_effect=_err)
with pytest.raises(CustomError) as excinfo:
commands.Commit(config, {})()
# Assert only the content in the formatted text
assert "This is the root custom err" in str(excinfo.value)
@pytest.mark.usefixtures("staging_is_clean")
def test_commit_when_non_customized_expected_raised(config, mocker: MockFixture):
mocker.patch("questionary.prompt", side_effect=ValueError())
with pytest.raises(ValueError):
commands.Commit(config, {})()
@pytest.mark.usefixtures("staging_is_clean")
def test_commit_when_no_user_answer(config, mocker: MockFixture):
mocker.patch("questionary.prompt", return_value=None)
with pytest.raises(NoAnswersError):
commands.Commit(config, {})()
def test_commit_in_non_git_project(tmpdir, config):
with tmpdir.as_cwd():
with pytest.raises(NotAGitProjectError):
commands.Commit(config, {})
@pytest.mark.usefixtures("staging_is_clean", "commit_mock", "prompt_mock_feat")
def test_commit_command_with_all_option(
config, success_mock: MockType, mocker: MockFixture
):
add_mock = mocker.patch("commitizen.git.add")
commands.Commit(config, {"all": True})()
add_mock.assert_called()
success_mock.assert_called_once()
@pytest.mark.usefixtures("staging_is_clean", "prompt_mock_feat")
def test_commit_command_with_extra_args(
config, success_mock: MockType, commit_mock: MockType
):
commands.Commit(config, {"extra_cli_args": "-- -extra-args1 -extra-arg2"})()
commit_mock.assert_called_once_with(ANY, args="-- -extra-args1 -extra-arg2")
success_mock.assert_called_once()
@pytest.mark.usefixtures("staging_is_clean")
@pytest.mark.parametrize("editor", ["vim", None])
def test_manual_edit(editor, config, mocker: MockFixture, tmp_path):
mocker.patch("commitizen.git.get_core_editor", return_value=editor)
subprocess_mock = mocker.patch("subprocess.call")
mocker.patch("shutil.which", return_value=editor)
test_message = "Initial commit message"
temp_file = tmp_path / "temp_commit_message"
temp_file.write_text(test_message)
mock_temp_file = mocker.patch("tempfile.NamedTemporaryFile")
mock_temp_file.return_value.__enter__.return_value.name = str(temp_file)
commit_cmd = commands.Commit(config, {"edit": True})
if editor is None:
with pytest.raises(RuntimeError):
commit_cmd.manual_edit(test_message)
else:
edited_message = commit_cmd.manual_edit(test_message)
subprocess_mock.assert_called_once_with(["vim", str(temp_file)])
assert edited_message == test_message.strip()
@pytest.mark.usefixtures("staging_is_clean", "prompt_mock_feat")
@pytest.mark.parametrize(
"out", ["no changes added to commit", "nothing added to commit"]
)
def test_commit_when_nothing_added_to_commit(config, mocker: MockFixture, out):
commit_mock = mocker.patch(
"commitizen.git.commit",
return_value=cmd.Command(
out=out,
err="",
stdout=out.encode(),
stderr=b"",
return_code=0,
),
)
error_mock = mocker.patch("commitizen.out.error")
commands.Commit(config, {})()
commit_mock.assert_called_once()
error_mock.assert_called_once_with(out)
@pytest.mark.usefixtures("staging_is_clean", "commit_mock")
def test_commit_command_with_config_message_length_limit(
config, success_mock: MockType, prompt_mock_feat: MockType
):
prefix = prompt_mock_feat.return_value["prefix"]
subject = prompt_mock_feat.return_value["subject"]
message_length = len(f"{prefix}: {subject}")
commands.Commit(config, {"message_length_limit": message_length})()
success_mock.assert_called_once()
with pytest.raises(CommitMessageLengthExceededError):
commands.Commit(config, {"message_length_limit": message_length - 1})()
config.settings["message_length_limit"] = message_length
success_mock.reset_mock()
commands.Commit(config, {})()
success_mock.assert_called_once()
config.settings["message_length_limit"] = message_length - 1
with pytest.raises(CommitMessageLengthExceededError):
commands.Commit(config, {})()
# Test config message length limit is overridden by CLI argument
success_mock.reset_mock()
commands.Commit(config, {"message_length_limit": message_length})()
success_mock.assert_called_once()
success_mock.reset_mock()
commands.Commit(config, {"message_length_limit": 0})()
success_mock.assert_called_once()
@pytest.mark.usefixtures("staging_is_clean")
def test_commit_command_with_body_length_limit_wrapping(
config, success_mock: MockType, mocker: MockFixture
):
"""Test that long body lines are automatically wrapped to the specified limit."""
mocker.patch(
"questionary.prompt",
return_value={
"prefix": "feat",
"subject": "add feature",
"scope": "",
"is_breaking_change": False,
"body": "This is a very long line that exceeds 72 characters and should be automatically wrapped by the system to fit within the limit",
"footer": "",
},
)
commit_mock = mocker.patch(
"commitizen.git.commit", return_value=cmd.Command("success", "", b"", b"", 0)
)
# Execute with body_length_limit
commands.Commit(config, {"body_length_limit": 72})()
success_mock.assert_called_once()
# Verify wrapping occurred
committed_message = commit_mock.call_args[0][0]
lines = committed_message.split("\n")
assert lines[0] == "feat: add feature"
assert lines[1] == ""
body_lines = lines[2:]
for line in body_lines:
if line.strip():
assert len(line) <= 72, (
f"Line exceeds 72 chars: '{line}' ({len(line)} chars)"
)
@pytest.mark.usefixtures("staging_is_clean")
def test_commit_command_with_body_length_limit_preserves_line_breaks(
config, success_mock: MockType, mocker: MockFixture
):
"""Test that intentional line breaks (from | character) are preserved."""
# Simulate what happens after multiple_line_breaker processes "line1 | line2 | line3"
mocker.patch(
"questionary.prompt",
return_value={
"prefix": "feat",
"subject": "add feature",
"scope": "",
"is_breaking_change": False,
"body": "Line1 that is very long and exceeds the limit\nLine2 that is very long and exceeds the limit\nLine3 that is very long and exceeds the limit",
"footer": "",
},
)
commit_mock = mocker.patch(
"commitizen.git.commit", return_value=cmd.Command("success", "", b"", b"", 0)
)
commands.Commit(config, {"body_length_limit": 45})()
success_mock.assert_called_once()
committed_message = commit_mock.call_args[0][0]
lines = committed_message.split("\n")
# Should have a subject, a blank line
assert lines[0] == "feat: add feature"
assert lines[1] == ""
# Each original line should be wrapped separately, preserving the line breaks
body_lines = lines[2:]
# All lines should be <= 45 chars
for line in body_lines:
if line.strip():
assert len(line) == 45, (
f"Line's length is not 45 chars: '{line}' ({len(line)} chars)"
)
@pytest.mark.usefixtures("staging_is_clean")
def test_commit_command_with_body_length_limit_disabled(
config, success_mock: MockType, mocker: MockFixture
):
"""Test that body_length_limit = 0 disables wrapping."""
long_body = "This is a very long line that exceeds 72 characters and should NOT be wrapped when body_length_limit is set to 0"
mocker.patch(
"questionary.prompt",
return_value={
"prefix": "feat",
"subject": "add feature",
"scope": "",
"is_breaking_change": False,
"body": long_body,
"footer": "",
},
)
commit_mock = mocker.patch(
"commitizen.git.commit", return_value=cmd.Command("success", "", b"", b"", 0)
)
# Execute with body_length_limit = 0 (disabled)
commands.Commit(config, {"body_length_limit": 0})()
success_mock.assert_called_once()
# Get the actual commit message
committed_message = commit_mock.call_args[0][0]
# Verify the body was NOT wrapped (should contain the original long line)
assert long_body in committed_message, "Body should not be wrapped when limit is 0"
@pytest.mark.usefixtures("staging_is_clean")
def test_commit_command_with_body_length_limit_from_config(
config, success_mock: MockType, mocker: MockFixture
):
"""Test that body_length_limit can be set via config."""
mocker.patch(
"questionary.prompt",
return_value={
"prefix": "feat",
"subject": "add feature",
"scope": "",
"is_breaking_change": False,
"body": "This is a very long line that exceeds 50 characters and should be wrapped",
"footer": "",
},
)
commit_mock = mocker.patch(
"commitizen.git.commit", return_value=cmd.Command("success", "", b"", b"", 0)
)
# Set body_length_limit in config
config.settings["body_length_limit"] = 50
commands.Commit(config, {})()
success_mock.assert_called_once()
# Get the actual commit message
committed_message = commit_mock.call_args[0][0]
# Verify all body lines are within the limit
lines = committed_message.split("\n")
body_lines = lines[2:]
for line in body_lines:
if line.strip():
assert len(line) <= 50, (
f"Line exceeds 50 chars: '{line}' ({len(line)} chars)"
)
@pytest.mark.usefixtures("staging_is_clean")
def test_commit_command_body_length_limit_cli_overrides_config(
config, success_mock: MockType, mocker: MockFixture
):
"""Test that CLI argument overrides config setting."""
mocker.patch(
"questionary.prompt",
return_value={
"prefix": "feat",
"subject": "add feature",
"scope": "",
"is_breaking_change": False,
"body": "This is a line that is longer than 40 characters but shorter than 80 characters",
"footer": "",
},
)
commit_mock = mocker.patch(
"commitizen.git.commit", return_value=cmd.Command("success", "", b"", b"", 0)
)
# Set config to 40 (would wrap)
config.settings["body_length_limit"] = 40
# Override with CLI argument to 0 (should NOT wrap)
commands.Commit(config, {"body_length_limit": 0})()
success_mock.assert_called_once()
# Get the actual commit message
committed_message = commit_mock.call_args[0][0]
# The line should NOT be wrapped (CLI override to 0 disables wrapping)
assert (
"This is a line that is longer than 40 characters but shorter than 80 characters"
in committed_message
)
@pytest.mark.usefixtures("staging_is_clean")
def test_commit_command_with_body_length_limit_no_body(
config, success_mock: MockType, mocker: MockFixture
):
"""Test that commits without body work correctly with body_length_limit set."""
mocker.patch(
"questionary.prompt",
return_value={
"prefix": "feat",
"subject": "add feature",
"scope": "",
"is_breaking_change": False,
"body": "", # No body
"footer": "",
},
)
commit_mock = mocker.patch(
"commitizen.git.commit", return_value=cmd.Command("success", "", b"", b"", 0)
)
# Execute commit with body_length_limit (should not crash)
commands.Commit(config, {"body_length_limit": 72})()
success_mock.assert_called_once()
# Get the actual commit message
committed_message = commit_mock.call_args[0][0]
# Should just be the subject line
assert committed_message.strip() == "feat: add feature"