fix bug (#13)

Author: acabarbaye

continuous_delivery_scripts/utils/configuration.py

@@ -158,7 +158,7 @@ class StaticConfig(GenericConfig):
     AWS_BUCKET = "Unknown"
     AUTOGENERATE_NEWS_FILE_ON_DEPENDENCY_UPDATE = True
     DEPENDENCY_UPDATE_NEWS_MESSAGE = "Dependency upgrade: {message}"
-    DEPENDENCY_UPDATE_NEWS_TYPE = NewsType.bugfix.name
+    DEPENDENCY_UPDATE_NEWS_TYPE = NewsType.bugfix
     DEPENDENCY_UPDATE_BRANCH_PATTERN = r"^\s*[Dd]ependabot\/.+\/(?P<DEPENDENCY>.+)"
     ACCEPTED_THIRD_PARTY_LICENCES = ["Apache-2.0", "BSD*", "JSON", "MIT", "Python-2.0", "PSF-2.0", "MPL-2.0"]
     PACKAGES_WITH_CHECKED_LICENCE: List[str] = []

continuous_delivery_scripts/utils/news_file.py

@@ -6,6 +6,7 @@
 import enum
 import pathlib
 from datetime import datetime
+from typing import Any
 
 
 class NewsType(enum.Enum):
@@ -19,9 +20,14 @@ class NewsType(enum.Enum):
     removal = 5
 
 
-def create_news_file(news_dir: str, news_text: str, news_type: NewsType) -> pathlib.Path:
+def create_news_file(news_dir: str, news_text: str, news_type: Any) -> pathlib.Path:
     """Facilitates creating a news file, determining it's file name based on the type."""
-    file_path = determine_news_file_path(news_dir, news_type)
+    message_type = NewsType.misc
+    if isinstance(news_type, str):
+        message_type = NewsType[news_type]
+    elif isinstance(news_type, NewsType):
+        message_type = news_type
+    file_path = determine_news_file_path(news_dir, message_type)
     _write_file(file_path, news_text)
     return file_path
 

news/202108101200.bugfix

@@ -0,0 +1 @@
+Fixed news file type bug

tests/news_file/test_create_news_file.py

@@ -31,6 +31,20 @@ def test_creates_a_file_with_available_file_name_and_returns_its_path(self, _wri
         determine_news_file_path.assert_called_once_with(NEWS_DIR, news_type)
         _write_file.assert_called_once_with(file_path, news_text)
 
+    @mock.patch("continuous_delivery_scripts.utils.news_file.determine_news_file_path")
+    @mock.patch("continuous_delivery_scripts.utils.news_file._write_file")
+    def test_creates_a_file_with_message_type_string(self, _write_file, determine_news_file_path):
+        news_file_path = pathlib.Path("some/1234501.feature")
+        determine_news_file_path.return_value = news_file_path
+        news_text = "Cool feature"
+        news_type = NewsType.feature
+
+        file_path = create_news_file(NEWS_DIR, news_text, news_type.name)
+
+        self.assertEqual(file_path, news_file_path)
+        determine_news_file_path.assert_called_once_with(NEWS_DIR, news_type)
+        _write_file.assert_called_once_with(file_path, news_text)
+
 
 class TestDetermineNewsFilePath(TestCase):
     def test_finds_first_available_file_path_in_news_dir(self):