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 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075
|
from __future__ import annotations
from textwrap import dedent
from typing import TYPE_CHECKING, Iterable, Sequence
import pytest
from semantic_release.commit_parser.emoji import EmojiCommitParser, EmojiParserOptions
from semantic_release.commit_parser.token import ParsedCommit, ParseError
from semantic_release.enums import LevelBump
from tests.const import SUPPORTED_ISSUE_CLOSURE_PREFIXES
if TYPE_CHECKING:
from tests.conftest import MakeCommitObjFn
@pytest.mark.parametrize(
"commit_message, bump, type_, descriptions, breaking_descriptions",
[
# Major bump
(
":boom: Breaking changes\n\nMore description\n\nEven more description",
LevelBump.MAJOR,
":boom:",
[":boom: Breaking changes"],
["More description", "Even more description"],
),
# Minor bump
(
":sparkles: Add a new feature\n\nSome description of the feature",
LevelBump.MINOR,
":sparkles:",
[":sparkles: Add a new feature", "Some description of the feature"],
[],
),
# Patch bump
(
":bug: Fixing a bug\n\nThe bug is finally gone!",
LevelBump.PATCH,
":bug:",
[":bug: Fixing a bug", "The bug is finally gone!"],
[],
),
# No release
(
":pencil: Documentation changes",
LevelBump.NO_RELEASE,
"Other",
[":pencil: Documentation changes"],
[],
),
# Multiple emojis
(
":sparkles::pencil: Add a feature and document it",
LevelBump.MINOR,
":sparkles:",
[":sparkles::pencil: Add a feature and document it"],
[],
),
# Emoji in description
(
":sparkles: Add a new feature\n\n:boom: should not be detected",
LevelBump.MINOR,
":sparkles:",
[":sparkles: Add a new feature"],
[],
),
],
)
def test_default_emoji_parser(
default_emoji_parser: EmojiCommitParser,
commit_message: str,
bump: LevelBump,
type_: str,
descriptions: list[str],
breaking_descriptions: list[str],
make_commit_obj: MakeCommitObjFn,
):
commit = make_commit_obj(commit_message)
parsed_results = default_emoji_parser.parse(commit)
assert isinstance(parsed_results, Iterable)
result = next(iter(parsed_results))
assert isinstance(result, ParsedCommit)
assert bump is result.bump
assert type_ == result.type
assert descriptions == result.descriptions
assert breaking_descriptions == result.breaking_descriptions
@pytest.mark.parametrize(
"message, subject, merge_request_number",
[
# GitHub, Gitea style
(
":sparkles: add new feature (#123)",
":sparkles: add new feature",
"#123",
),
# GitLab style
(
":bug: fix regex in parser (!456)",
":bug: fix regex in parser",
"!456",
),
# BitBucket style
(
":sparkles: add new feature (pull request #123)",
":sparkles: add new feature",
"#123",
),
# Both a linked merge request and an issue footer (should return the linked merge request)
(":bug: superfix (#123)\n\nCloses: #400", ":bug: superfix", "#123"),
# None
(":bug: superfix", ":bug: superfix", ""),
# None but includes an issue footer it should not be considered a linked merge request
(":bug: superfix\n\nCloses: #400", ":bug: superfix", ""),
],
)
def test_parser_return_linked_merge_request_from_commit_message(
default_emoji_parser: EmojiCommitParser,
message: str,
subject: str,
merge_request_number: str,
make_commit_obj: MakeCommitObjFn,
):
parsed_results = default_emoji_parser.parse(make_commit_obj(message))
assert isinstance(parsed_results, Iterable)
result = next(iter(parsed_results))
assert isinstance(result, ParsedCommit)
assert merge_request_number == result.linked_merge_request
assert subject == result.descriptions[0]
@pytest.mark.parametrize(
"message, linked_issues",
[
*[
# GitHub, Gitea, GitLab style
(
f":sparkles: (parser) add magic parser\n\n{footer}",
linked_issues,
)
for footer_prefix in SUPPORTED_ISSUE_CLOSURE_PREFIXES
for footer, linked_issues in [
# Single issue
(
f"{footer_prefix.capitalize()}: #555",
["#555"],
), # Git Footer style (capitalized)
(f"{footer_prefix.lower()}: #555", ["#555"]), # lowercase prefix
(f"{footer_prefix.upper()}: #555", ["#555"]), # uppercase prefix
# Mulitple issues (variant 1: list with one prefix, not supported by GitHub)
(
f"{footer_prefix}: #555,#444",
["#444", "#555"],
), # Comma separated (w/o space)
(
f"{footer_prefix}: #555, #444",
["#444", "#555"],
), # Comma separated (w/ space)
(
f"{footer_prefix}: #555 , #444",
["#444", "#555"],
), # Comma separated (w/ extra space)
(f"{footer_prefix}: #555 #444", ["#444", "#555"]), # Space separated
(
f"{footer_prefix}: #555;#444",
["#444", "#555"],
), # semicolon separated (w/o space)
(
f"{footer_prefix}: #555; #444",
["#444", "#555"],
), # semicolon separated (w/ space)
(
f"{footer_prefix}: #555 ; #444",
["#444", "#555"],
), # semicolon separated (w/ extra space)
(
f"{footer_prefix}: #555/#444",
["#444", "#555"],
), # slash separated (w/o space)
(
f"{footer_prefix}: #555/ #444",
["#444", "#555"],
), # slash separated (w/ space)
(
f"{footer_prefix}: #555 / #444",
["#444", "#555"],
), # slash separated (w/ extra space)
(
f"{footer_prefix}: #555Ƽ",
["#444", "#555"],
), # ampersand separated (w/o space)
(
f"{footer_prefix}: #555& #444",
["#444", "#555"],
), # ampersand separated (w/ space)
(
f"{footer_prefix}: #555 & #444",
["#444", "#555"],
), # ampersand separated (w/ extra space)
(f"{footer_prefix}: #555 and #444", ["#444", "#555"]), # and separated
(
f"{footer_prefix}: #555, #444, and #333",
["#333", "#444", "#555"],
), # and separated
# Mulitple issues (variant 2: multiple footers, supported by GitHub)
(f"{footer_prefix}: #555\n{footer_prefix}: #444", ["#444", "#555"]),
# More than 2 issues
(
f"{footer_prefix}: #555, #444, #333",
["#333", "#444", "#555"],
),
# More than 2 issues (force numerical sort)
(
f"{footer_prefix}: #555, #3333, #444",
["#444", "#555", "#3333"],
),
# Single issue listed multiple times
(f"{footer_prefix}: #555, #555", ["#555"]),
# Multiple footers with the same issue
(f"{footer_prefix}: #555\n{footer_prefix}: #555", ["#555"]),
# Multiple issues via multiple inline git footers
(f"{footer_prefix}: #555, {footer_prefix}: #444", ["#444", "#555"]),
# Multiple valid footers
(
str.join(
"\n",
[
f"{footer_prefix}: #555",
"Signed-off-by: johndoe <johndoe@mail.com>",
f"{footer_prefix}: #444",
],
),
["#444", "#555"],
),
# ----------------------------------------- Invalid Sets ----------------------------------------- #
# Must have colon because it is a git footer, these will not return a linked issue
(f"{footer_prefix} #666", []),
(f"{footer_prefix} #666, #777", []),
# Invalid Multiple issues (although it is supported by GitHub, it is not supported by the parser)
(f"{footer_prefix} #666, {footer_prefix} #777", []),
# Invalid 'and' separation
(f"{footer_prefix}: #666and#777", ["#666and#777"]),
# Invalid prefix
("ref: #666", []),
# body mentions an issue and has a different git footer
(
"In #666, the devils in the details...\n\nSigned-off-by: johndoe <johndoe@mail.com>",
[],
),
]
],
*[
# JIRA style
(
f":sparkles: (parser) add magic parser\n\n{footer}",
linked_issues,
)
for footer_prefix in SUPPORTED_ISSUE_CLOSURE_PREFIXES
for footer, linked_issues in [
# Single issue
(
f"{footer_prefix.capitalize()}: ABC-555",
["ABC-555"],
), # Git Footer style (capitalized)
(f"{footer_prefix.lower()}: ABC-555", ["ABC-555"]), # lowercase prefix
(f"{footer_prefix.upper()}: ABC-555", ["ABC-555"]), # uppercase prefix
# Mulitple issues (variant 1: list with one prefix, not supported by GitHub)
(
f"{footer_prefix}: ABC-555,ABC-444",
["ABC-444", "ABC-555"],
), # Comma separated (w/o space)
(
f"{footer_prefix}: ABC-555, ABC-444",
["ABC-444", "ABC-555"],
), # Comma separated (w/ space)
(
f"{footer_prefix}: ABC-555 , ABC-444",
["ABC-444", "ABC-555"],
), # Comma separated (w/ extra space)
(
f"{footer_prefix}: ABC-555 ABC-444",
["ABC-444", "ABC-555"],
), # Space separated
(
f"{footer_prefix}: ABC-555;ABC-444",
["ABC-444", "ABC-555"],
), # semicolon separated (w/o space)
(
f"{footer_prefix}: ABC-555; ABC-444",
["ABC-444", "ABC-555"],
), # semicolon separated (w/ space)
(
f"{footer_prefix}: ABC-555 ; ABC-444",
["ABC-444", "ABC-555"],
), # semicolon separated (w/ extra space)
(
f"{footer_prefix}: ABC-555/ABC-444",
["ABC-444", "ABC-555"],
), # slash separated (w/o space)
(
f"{footer_prefix}: ABC-555/ ABC-444",
["ABC-444", "ABC-555"],
), # slash separated (w/ space)
(
f"{footer_prefix}: ABC-555 / ABC-444",
["ABC-444", "ABC-555"],
), # slash separated (w/ extra space)
(
f"{footer_prefix}: ABC-555&ABC-444",
["ABC-444", "ABC-555"],
), # ampersand separated (w/o space)
(
f"{footer_prefix}: ABC-555& ABC-444",
["ABC-444", "ABC-555"],
), # ampersand separated (w/ space)
(
f"{footer_prefix}: ABC-555 & ABC-444",
["ABC-444", "ABC-555"],
), # ampersand separated (w/ extra space)
(
f"{footer_prefix}: ABC-555 and ABC-444",
["ABC-444", "ABC-555"],
), # and separated
(
f"{footer_prefix}: ABC-555, ABC-444, and ABC-333",
["ABC-333", "ABC-444", "ABC-555"],
), # and separated
# Mulitple issues (variant 2: multiple footers, supported by GitHub)
(
f"{footer_prefix}: ABC-555\n{footer_prefix}: ABC-444",
["ABC-444", "ABC-555"],
),
# More than 2 issues
(
f"{footer_prefix}: ABC-555, ABC-444, ABC-333",
["ABC-333", "ABC-444", "ABC-555"],
),
# More than 2 issues (force numerical sort)
(
f"{footer_prefix}: ABC-555, ABC-3333, ABC-444",
["ABC-444", "ABC-555", "ABC-3333"],
),
# Single issue listed multiple times
(f"{footer_prefix}: ABC-555, ABC-555", ["ABC-555"]),
# Multiple footers with the same issue
(f"{footer_prefix}: ABC-555\n{footer_prefix}: ABC-555", ["ABC-555"]),
# Multiple issues via multiple inline git footers
(
f"{footer_prefix}: ABC-666, {footer_prefix}: ABC-777",
["ABC-666", "ABC-777"],
),
# Multiple valid footers
(
str.join(
"\n",
[
f"{footer_prefix}: ABC-555",
"Signed-off-by: johndoe <johndoe@mail.com>",
f"{footer_prefix}: ABC-444",
],
),
["ABC-444", "ABC-555"],
),
# ----------------------------------------- Invalid Sets ----------------------------------------- #
# Must have colon because it is a git footer, these will not return a linked issue
(f"{footer_prefix} ABC-666", []),
(f"{footer_prefix} ABC-666, ABC-777", []),
# Invalid Multiple issues (although it is supported by GitHub, it is not supported by the parser)
(f"{footer_prefix} ABC-666, {footer_prefix} ABC-777", []),
# Invalid 'and' separation
(f"{footer_prefix}: ABC-666andABC-777", ["ABC-666andABC-777"]),
# Invalid prefix
("ref: ABC-666", []),
# body mentions an issue and has a different git footer
(
"In ABC-666, the devils in the details...\n\nSigned-off-by: johndoe <johndoe@mail.com>",
[],
),
]
],
*[
(
f":sparkles: (parser) add magic parser\n\n{footer}",
linked_issues,
)
for footer, linked_issues in [
# Multiple footers with the same issue but different prefixes
("Resolves: #555\nfix: #444", ["#444", "#555"]),
# Whitespace padded footer
(" Resolves: #555\n", ["#555"]),
]
],
(
# Only grabs the issue reference when there is a GitHub PR reference in the subject
":sparkles: (parser) add magic parser (#123)\n\nCloses: #555",
["#555"],
),
# Does not grab an issue when there is only a GitHub PR reference in the subject
(":sparkles: (parser) add magic parser (#123)", []),
# Does not grab an issue when there is only a Bitbucket PR reference in the subject
(":sparkles: (parser) add magic parser (pull request #123)", []),
],
)
def test_parser_return_linked_issues_from_commit_message(
default_emoji_parser: EmojiCommitParser,
message: str,
linked_issues: Sequence[str],
make_commit_obj: MakeCommitObjFn,
):
# Setup: Enable parsing of linked issues
parser = EmojiCommitParser(
options=EmojiParserOptions(
**{
**default_emoji_parser.options.__dict__,
"parse_linked_issues": True,
}
)
)
# Action
parsed_results = parser.parse(make_commit_obj(message))
assert isinstance(parsed_results, Iterable)
assert len(parsed_results) == 1
# Evaluate (expected -> actual)
result = next(iter(parsed_results))
assert isinstance(result, ParsedCommit)
assert tuple(linked_issues) == result.linked_issues
@pytest.mark.parametrize(
"message, notices",
[
pytest.param(
message,
notices,
id=test_id,
)
for test_id, message, notices in [
(
"single notice",
dedent(
"""\
:bug:(parser): fix regex in emoji parser
NOTICE: This is a notice
"""
),
["This is a notice"],
),
(
"multiline notice",
dedent(
"""\
:bug:(parser): fix regex in emoji parser
NOTICE: This is a notice that is longer than
other notices
"""
),
["This is a notice that is longer than other notices"],
),
(
"multiple notices",
dedent(
"""\
:bug:(parser): fix regex in emoji parser
NOTICE: This is a notice
NOTICE: This is a second notice
"""
),
["This is a notice", "This is a second notice"],
),
(
"notice with other footer",
dedent(
"""\
:bug:(parser): fix regex in emoji parser
BREAKING CHANGE: This is a breaking change
NOTICE: This is a notice
"""
),
["This is a notice"],
),
]
],
)
def test_parser_return_release_notices_from_commit_message(
default_emoji_parser: EmojiCommitParser,
message: str,
notices: Sequence[str],
make_commit_obj: MakeCommitObjFn,
):
parsed_results = default_emoji_parser.parse(make_commit_obj(message))
assert isinstance(parsed_results, Iterable)
assert len(parsed_results) == 1
result = next(iter(parsed_results))
assert isinstance(result, ParsedCommit)
assert tuple(notices) == result.release_notices
full_description = str.join("\n\n", result.descriptions)
full_notice = str.join("\n\n", result.release_notices)
assert full_notice not in full_description
@pytest.mark.parametrize(
"commit_message, expected_commit_details",
[
pytest.param(
commit_message,
expected_commit_details,
id=test_id,
)
for test_id, commit_message, expected_commit_details in [
(
"Single commit squashed via BitBucket PR resolution",
dedent(
"""\
Merged in feat/my-awesome-stuff (pull request #10)
:bug:(release-config): some commit subject
An additional description
Second paragraph with multiple lines
that will be condensed
Resolves: #12
Signed-off-by: author <author@not-an-email.com>
"""
),
[
{
"bump": LevelBump.NO_RELEASE,
"type": "Other",
"descriptions": ["Merged in feat/my-awesome-stuff"],
"linked_merge_request": "#10",
},
{
"bump": LevelBump.PATCH,
"type": ":bug:",
"scope": "release-config",
"descriptions": [
":bug:(release-config): some commit subject",
"An additional description",
"Second paragraph with multiple lines that will be condensed",
"Signed-off-by: author <author@not-an-email.com>",
],
"linked_issues": ("#12",),
"linked_merge_request": "#10",
},
],
),
(
"Multiple commits squashed via BitBucket PR resolution",
dedent(
"""\
Merged in feat/my-awesome-stuff (pull request #10)
:bug:(release-config): some commit subject
An additional description
Second paragraph with multiple lines
that will be condensed
Resolves: #12
Signed-off-by: author <author@not-an-email.com>
:sparkles: implemented searching gizmos by keyword
:memo:(parser): add new parser pattern
:boom::bug: changed option name
A breaking change description
Closes: #555
invalid non-conventional formatted commit
"""
),
[
{
"bump": LevelBump.NO_RELEASE,
"type": "Other",
"descriptions": ["Merged in feat/my-awesome-stuff"],
"linked_merge_request": "#10",
},
{
"bump": LevelBump.PATCH,
"type": ":bug:",
"scope": "release-config",
"descriptions": [
":bug:(release-config): some commit subject",
"An additional description",
"Second paragraph with multiple lines that will be condensed",
"Signed-off-by: author <author@not-an-email.com>",
],
"linked_issues": ("#12",),
"linked_merge_request": "#10",
},
{
"bump": LevelBump.MINOR,
"type": ":sparkles:",
"descriptions": [
":sparkles: implemented searching gizmos by keyword"
],
"linked_merge_request": "#10",
},
{
"bump": LevelBump.NO_RELEASE,
"type": ":memo:",
"scope": "parser",
"descriptions": [
":memo:(parser): add new parser pattern",
],
"linked_merge_request": "#10",
},
{
"bump": LevelBump.MAJOR,
"type": ":boom:",
"scope": "",
"descriptions": [
":boom::bug: changed option name",
],
"breaking_descriptions": [
"A breaking change description",
# This is a bit unusual but its because there is no identifier that will
# identify this as a separate commit so it gets included in the previous commit
"invalid non-conventional formatted commit",
],
"linked_issues": ("#555",),
"linked_merge_request": "#10",
},
],
),
]
],
)
def test_parser_squashed_commit_bitbucket_squash_style(
default_emoji_parser: EmojiCommitParser,
make_commit_obj: MakeCommitObjFn,
commit_message: str,
expected_commit_details: Sequence[dict | None],
):
# Setup: Enable squash commit parsing
parser = EmojiCommitParser(
options=EmojiParserOptions(
**{
**default_emoji_parser.options.__dict__,
"parse_squash_commits": True,
"parse_linked_issues": True,
}
)
)
# Build the commit object and parse it
the_commit = make_commit_obj(commit_message)
parsed_results = parser.parse(the_commit)
# Validate the results
assert isinstance(parsed_results, Iterable)
assert (
len(expected_commit_details) == len(parsed_results)
), f"Expected {len(expected_commit_details)} parsed results, but got {len(parsed_results)}"
for result, expected in zip(parsed_results, expected_commit_details):
if expected is None:
assert isinstance(result, ParseError)
continue
assert isinstance(result, ParsedCommit)
# Required
assert expected["bump"] == result.bump
assert expected["type"] == result.type
# Optional
assert expected.get("scope", "") == result.scope
# TODO: v11 change to tuples
assert expected.get("descriptions", []) == result.descriptions
assert expected.get("breaking_descriptions", []) == result.breaking_descriptions
assert expected.get("linked_issues", ()) == result.linked_issues
assert expected.get("linked_merge_request", "") == result.linked_merge_request
@pytest.mark.parametrize(
"commit_message, expected_commit_details",
[
pytest.param(
commit_message,
expected_commit_details,
id=test_id,
)
for test_id, commit_message, expected_commit_details in [
(
"Single commit squashed via manual Git squash merge",
dedent(
"""\
Squashed commit of the following:
commit 63ec09b9e844e616dcaa7bae35a0b66671b59fbb
Author: author <author@not-an-email.com>
Date: Sun Jan 19 12:05:23 2025 +0000
:bug:(release-config): some commit subject
An additional description
Second paragraph with multiple lines
that will be condensed
Resolves: #12
Signed-off-by: author <author@not-an-email.com>
"""
),
[
{
"bump": LevelBump.PATCH,
"type": ":bug:",
"scope": "release-config",
"descriptions": [
":bug:(release-config): some commit subject",
"An additional description",
"Second paragraph with multiple lines that will be condensed",
"Signed-off-by: author <author@not-an-email.com>",
],
"linked_issues": ("#12",),
}
],
),
(
"Multiple commits squashed via manual Git squash merge",
dedent(
"""\
Squashed commit of the following:
commit 63ec09b9e844e616dcaa7bae35a0b66671b59fbb
Author: author <author@not-an-email.com>
Date: Sun Jan 19 12:05:23 2025 +0000
:bug:(release-config): some commit subject
An additional description
Second paragraph with multiple lines
that will be condensed
Resolves: #12
Signed-off-by: author <author@not-an-email.com>
commit 1f34769bf8352131ad6f4879b8c47becf3c7aa69
Author: author <author@not-an-email.com>
Date: Sat Jan 18 10:13:53 2025 +0000
:sparkles: implemented searching gizmos by keyword
commit b2334a64a11ef745a17a2a4034f651e08e8c45a6
Author: author <author@not-an-email.com>
Date: Sat Jan 18 10:13:53 2025 +0000
:memo:(parser): add new parser pattern
commit 5f0292fb5a88c3a46e4a02bec35b85f5228e8e51
Author: author <author@not-an-email.com>
Date: Sat Jan 18 10:13:53 2025 +0000
:boom::bug: changed option name
A breaking change description
Closes: #555
commit 2f314e7924be161cfbf220d3b6e2a6189a3b5609
Author: author <author@not-an-email.com>
Date: Sat Jan 18 10:13:53 2025 +0000
invalid non-conventional formatted commit
"""
),
[
{
"bump": LevelBump.PATCH,
"type": ":bug:",
"scope": "release-config",
"descriptions": [
":bug:(release-config): some commit subject",
"An additional description",
"Second paragraph with multiple lines that will be condensed",
"Signed-off-by: author <author@not-an-email.com>",
],
"linked_issues": ("#12",),
},
{
"bump": LevelBump.MINOR,
"type": ":sparkles:",
"descriptions": [
":sparkles: implemented searching gizmos by keyword"
],
},
{
"bump": LevelBump.NO_RELEASE,
"type": ":memo:",
"scope": "parser",
"descriptions": [
":memo:(parser): add new parser pattern",
],
},
{
"bump": LevelBump.MAJOR,
"type": ":boom:",
"descriptions": [
":boom::bug: changed option name",
],
"breaking_descriptions": [
"A breaking change description",
],
"linked_issues": ("#555",),
},
{
"bump": LevelBump.NO_RELEASE,
"type": "Other",
"descriptions": ["invalid non-conventional formatted commit"],
},
],
),
]
],
)
def test_parser_squashed_commit_git_squash_style(
default_emoji_parser: EmojiCommitParser,
make_commit_obj: MakeCommitObjFn,
commit_message: str,
expected_commit_details: Sequence[dict | None],
):
# Setup: Enable squash commit parsing
parser = EmojiCommitParser(
options=EmojiParserOptions(
**{
**default_emoji_parser.options.__dict__,
"parse_squash_commits": True,
"parse_linked_issues": True,
}
)
)
# Build the commit object and parse it
the_commit = make_commit_obj(commit_message)
parsed_results = parser.parse(the_commit)
# Validate the results
assert isinstance(parsed_results, Iterable)
assert (
len(expected_commit_details) == len(parsed_results)
), f"Expected {len(expected_commit_details)} parsed results, but got {len(parsed_results)}"
for result, expected in zip(parsed_results, expected_commit_details):
if expected is None:
assert isinstance(result, ParseError)
continue
assert isinstance(result, ParsedCommit)
# Required
assert expected["bump"] == result.bump
assert expected["type"] == result.type
# Optional
assert expected.get("scope", "") == result.scope
# TODO: v11 change to tuples
assert expected.get("descriptions", []) == result.descriptions
assert expected.get("breaking_descriptions", []) == result.breaking_descriptions
assert expected.get("linked_issues", ()) == result.linked_issues
assert expected.get("linked_merge_request", "") == result.linked_merge_request
@pytest.mark.parametrize(
"commit_message, expected_commit_details",
[
pytest.param(
commit_message,
expected_commit_details,
id=test_id,
)
for test_id, commit_message, expected_commit_details in [
(
"Single commit squashed via GitHub PR resolution",
dedent(
"""\
:bug:(release-config): some commit subject (#10)
An additional description
Second paragraph with multiple lines
that will be condensed
Resolves: #12
Signed-off-by: author <author@not-an-email.com>
"""
),
[
{
"bump": LevelBump.PATCH,
"type": ":bug:",
"scope": "release-config",
"descriptions": [
":bug:(release-config): some commit subject",
"An additional description",
"Second paragraph with multiple lines that will be condensed",
"Signed-off-by: author <author@not-an-email.com>",
],
"linked_issues": ("#12",),
"linked_merge_request": "#10",
},
],
),
(
"Multiple commits squashed via GitHub PR resolution",
dedent(
"""\
:bug:(release-config): some commit subject (#10)
An additional description
Second paragraph with multiple lines
that will be condensed
Resolves: #12
Signed-off-by: author <author@not-an-email.com>
* :sparkles: implemented searching gizmos by keyword
* :memo:(parser): add new parser pattern
* :boom::bug: changed option name
A breaking change description
Closes: #555
* invalid non-conventional formatted commit
"""
),
[
{
"bump": LevelBump.PATCH,
"type": ":bug:",
"scope": "release-config",
"descriptions": [
":bug:(release-config): some commit subject",
"An additional description",
"Second paragraph with multiple lines that will be condensed",
"Signed-off-by: author <author@not-an-email.com>",
],
"linked_issues": ("#12",),
"linked_merge_request": "#10",
},
{
"bump": LevelBump.MINOR,
"type": ":sparkles:",
"descriptions": [
":sparkles: implemented searching gizmos by keyword"
],
"linked_merge_request": "#10",
},
{
"bump": LevelBump.NO_RELEASE,
"type": ":memo:",
"scope": "parser",
"descriptions": [
":memo:(parser): add new parser pattern",
],
"linked_merge_request": "#10",
},
{
"bump": LevelBump.MAJOR,
"type": ":boom:",
"scope": "",
"descriptions": [
":boom::bug: changed option name",
],
"breaking_descriptions": [
"A breaking change description",
# This is a bit unusual but its because there is no identifier that will
# identify this as a separate commit so it gets included in the previous commit
"* invalid non-conventional formatted commit",
],
"linked_issues": ("#555",),
"linked_merge_request": "#10",
},
],
),
]
],
)
def test_parser_squashed_commit_github_squash_style(
default_emoji_parser: EmojiCommitParser,
make_commit_obj: MakeCommitObjFn,
commit_message: str,
expected_commit_details: Sequence[dict | None],
):
# Setup: Enable squash commit parsing
parser = EmojiCommitParser(
options=EmojiParserOptions(
**{
**default_emoji_parser.options.__dict__,
"parse_squash_commits": True,
"parse_linked_issues": True,
}
)
)
# Build the commit object and parse it
the_commit = make_commit_obj(commit_message)
parsed_results = parser.parse(the_commit)
# Validate the results
assert isinstance(parsed_results, Iterable)
assert (
len(expected_commit_details) == len(parsed_results)
), f"Expected {len(expected_commit_details)} parsed results, but got {len(parsed_results)}"
for result, expected in zip(parsed_results, expected_commit_details):
if expected is None:
assert isinstance(result, ParseError)
continue
assert isinstance(result, ParsedCommit)
# Required
assert expected["bump"] == result.bump
assert expected["type"] == result.type
# Optional
assert expected.get("scope", "") == result.scope
# TODO: v11 change to tuples
assert expected.get("descriptions", []) == result.descriptions
assert expected.get("breaking_descriptions", []) == result.breaking_descriptions
assert expected.get("linked_issues", ()) == result.linked_issues
assert expected.get("linked_merge_request", "") == result.linked_merge_request
def test_parser_ignore_merge_commit(
default_emoji_parser: EmojiCommitParser,
make_commit_obj: MakeCommitObjFn,
):
# Setup: Enable parsing of linked issues
parser = EmojiCommitParser(
options=EmojiParserOptions(
**{
**default_emoji_parser.options.__dict__,
"ignore_merge_commits": True,
}
)
)
base_commit = make_commit_obj("Merge branch 'fix/fix-feature' into 'main'")
incomming_commit = make_commit_obj("feat: add a new feature")
# Setup: Create a merge commit
merge_commit = make_commit_obj("Merge branch 'feat/add-new-feature' into 'main'")
merge_commit.parents = [base_commit, incomming_commit]
# Action
parsed_result = parser.parse(merge_commit)
assert isinstance(parsed_result, ParseError)
assert "Ignoring merge commit" in parsed_result.error
|