Fixes

src/matyan/patterns.py

@@ -39,7 +39,8 @@ def get_branch_types_for_regex() -> str:
     r'((?P<ticket_number>[a-zA-Z]{1,7}-\d{4,6})-)?' \
     r'(?P<branch_title>[a-zA-Z-\d]*)'
 
-REGEX_PATTERN_MERGED_BRANCH_NAME = r'(\s*)Merged in ' + \
+REGEX_PATTERN_MERGED_BRANCH_NAME = r'(\s*)' \
+                                   r'((Merged in )|(Merge pull request.*))' + \
                                    REGEX_PATTERN_BRANCH_NAME
 
 REGEX_PATTERN_COMMIT = r'(?P<ticket_number>[a-zA-Z]{1,7}-\d{4,6})?'

src/matyan/tests/test_core.py

@@ -1,49 +1,60 @@
-# # -*- coding: utf-8 -*-
-#
-# import copy
-# import logging
-# import os
-# import unittest
-#
-# from ..utils import (
-#     create_config_file,
-#     generate_changelog_cli,
-#     generate_empty_tree,
-#     get_branch_type,
-#     get_logs,
-#     json_changelog_cli,
-#     prepare_changelog,
-#     prepare_releases_changelog,
-#     validate_between,
-# )
-#
-# from .base import internet_available_only, log_info
-#
-# __author__ = 'Artur Barseghyan'
-# __copyright__ = '2019 Artur Barseghyan'
-# __license__ = 'GPL-2.0-only OR LGPL-2.0-or-later'
-# __all__ = ('TestCore',)
-#
-# LOGGER = logging.getLogger(__name__)
-#
-#
-# class TestCore(unittest.TestCase):
-#     """Core matyan functionality tests."""
-#
-#     def setUp(self):
-#         """Set up."""
-#         # TODO
-#
-#     def tearDown(self):
-#         """Tear down."""
-#         # TODO
-#
-#     @internet_available_only
-#     @log_info
-#     def test_01_generate_changelog_command(self):
-#         """Test generate changelog."""
-#         # TODO
-#
-#
-# if __name__ == '__main__':
-#     unittest.main()
+# -*- coding: utf-8 -*-
+
+import copy
+import re
+import logging
+import os
+import unittest
+
+from ..utils import (
+    create_config_file,
+    generate_changelog_cli,
+    generate_empty_tree,
+    get_branch_type,
+    get_logs,
+    json_changelog_cli,
+    prepare_changelog,
+    prepare_releases_changelog,
+    validate_between,
+)
+from ..patterns import (
+    REGEX_PATTERN_MERGED_BRANCH_NAME,
+)
+
+from .base import internet_available_only, log_info
+
+__author__ = 'Artur Barseghyan'
+__copyright__ = '2019 Artur Barseghyan'
+__license__ = 'GPL-2.0-only OR LGPL-2.0-or-later'
+__all__ = ('TestCore',)
+
+LOGGER = logging.getLogger(__name__)
+
+
+class TestCore(unittest.TestCase):
+    """Core matyan functionality tests."""
+
+    def setUp(self):
+        """Set up."""
+        # TODO
+
+    def tearDown(self):
+        """Tear down."""
+        # TODO
+
+    @log_info
+    def test_01_merge_branch_patterns(self):
+        """Test generate changelog."""
+        merge_messages = [
+            'Merge pull request #1234 in PROJ/repo from bugfix/PROJ-'
+            '3545-currency-not-saved-at-sso to dev',
+            'Merged in bugfix/MSFT-1236-prevent-duplicate-postal-codes '
+            '(pull request #3)',
+        ]
+        for message in merge_messages:
+            match = re.match(REGEX_PATTERN_MERGED_BRANCH_NAME, message)
+            self.assertIsNotNone(match)
+
+
+if __name__ == '__main__':
+    unittest.main()

src/matyan/utils.py

@@ -200,7 +200,10 @@ def prepare_changelog(
 
     # First fill feature branches only
     for json_entry in logs['LOG_MERGES']:
-        entry = json.loads(json_entry)
+        try:
+            entry = json.loads(json_entry)
+        except json.decoder.JSONDecodeError:
+            continue  # TODO: fix this (when commit message contains " symbols)
         merge_commit = True if ' ' in entry['merge'] else False
         if merge_commit:
             match = re.match(REGEX_PATTERN_MERGED_BRANCH_NAME, entry['title'])
@@ -346,7 +349,10 @@ def prepare_releases_changelog(
 
     # First fill feature branches only
     for json_entry in logs['LOG_MERGES']:
-        entry = json.loads(json_entry)
+        try:
+            entry = json.loads(json_entry)
+        except json.decoder.JSONDecodeError:
+            continue  # TODO: fix this (when commit message contains " symbols)
         merge_commit = True if ' ' in entry['merge'] else False
         if merge_commit:
             match = re.match(REGEX_PATTERN_MERGED_BRANCH_NAME, entry['title'])