added test cases

Author: Bala-Sakabattula

fedmsg.d/sync2jira.py

@@ -95,6 +95,8 @@
                         'upstream_id',      # Add comment with upstream PR link on create
                         'url',              # Include upstream URL in description
                         'github_project_fields',  # Sync storypoints & priority from GitHub Projects
+                        {'fixVersion': {'overwrite': False}},  # Sync milestone as fixVersion
+                        {'transition': 'Closed'},  # Transition Jira when upstream issue closes
                         {'merge_transition': 'Closed'},    # Transition Jira when PR is merged
                         {'link_transition': 'In Progress'},  # Transition Jira when PR is first linked
                         {'assignee': {'overwrite': False}},  # Sync assignee (don't overwrite existing)

tests/test_downstream_issue.py

@@ -1123,6 +1123,14 @@ def test_maybe_convert_markdown(self, mock_convert):
         d.maybe_convert_markdown(issue)
         self.assertEqual(issue.content, "h1. Hello")
 
+        # Converts with explicit "issue_updates" parameter
+        mock_convert.reset_mock()
+        mock_convert.return_value = "h1. Hello"
+        issue.downstream = {"issue_updates": ["github_markdown"]}
+        issue.content = "# Hello"
+        d.maybe_convert_markdown(issue, "issue_updates")
+        self.assertEqual(issue.content, "h1. Hello")
+
         # Works with pr_updates key
         mock_convert.reset_mock()
         mock_convert.return_value = "*bold*"
@@ -1146,11 +1154,29 @@ def test_maybe_convert_markdown(self, mock_convert):
         self.assertEqual(issue.content, "")
 
         # Skips when source is not github
+        mock_convert.reset_mock()
         issue.source = "pagure"
         issue.downstream = {"issue_updates": ["github_markdown"]}
         issue.content = "# Hello"
         d.maybe_convert_markdown(issue)
         self.assertEqual(issue.content, "# Hello")
+        self.assertEqual(mock_convert.call_count, 0)
+
+        # Skips when updates_key is not present in downstream config
+        mock_convert.reset_mock()
+        issue.source = "github"
+        issue.downstream = {}
+        issue.content = "# Hello"
+        d.maybe_convert_markdown(issue)
+        self.assertEqual(issue.content, "# Hello")
+        self.assertEqual(mock_convert.call_count, 0)
+
+        # Skips when updates list is empty
+        issue.downstream = {"issue_updates": []}
+        issue.content = "# Hello"
+        d.maybe_convert_markdown(issue)
+        self.assertEqual(issue.content, "# Hello")
+        self.assertEqual(mock_convert.call_count, 0)
 
     @mock.patch(PATH + "pypandoc")
     def test_convert_content(self, mock_pypandoc):

tests/test_downstream_pr.py

@@ -2,6 +2,7 @@
 import unittest.mock as mock
 from unittest.mock import MagicMock
 
+import sync2jira.downstream_issue as d_issue
 import sync2jira.downstream_pr as d
 
 PATH = "sync2jira.downstream_pr."
@@ -397,6 +398,112 @@ def test_update_pr_transition(self, mock_d_issue):
             mock_client, self.mock_existing, "CUSTOM_TRANSITION1", self.mock_pr
         )
 
+    @mock.patch(PATH + "d_issue.change_status")
+    @mock.patch(PATH + "d_issue.update_jira_issue", wraps=d_issue.update_jira_issue)
+    @mock.patch(PATH + "comment_exists", return_value=True)
+    @mock.patch(PATH + "format_comment", return_value="mock_comment")
+    @mock.patch(PATH + "d_issue.attach_link")
+    @mock.patch(PATH + "issue_link_exists", return_value=True)
+    def test_update_jira_issue_transition_noop_when_status_none(
+        self,
+        mock_issue_link_exists,
+        mock_attach_link,
+        mock_format_comment,
+        mock_comment_exists,
+        mock_shared_update,
+        mock_change_status,
+    ):
+        """github.pull_request path: PR has status=None, so _update_transition
+        is a no-op even when {'transition': 'Closed'} is in pr_updates.
+        """
+        self.mock_pr.status = None
+        self.mock_pr.downstream = {
+            "pr_updates": [{"transition": "Closed"}],
+        }
+
+        d.update_jira_issue(
+            self.mock_existing, self.mock_pr, self.mock_client, self.mock_config
+        )
+
+        mock_change_status.assert_not_called()
+
+    @mock.patch(PATH + "d_issue.change_status")
+    @mock.patch(PATH + "comment_exists", return_value=True)
+    @mock.patch(PATH + "format_comment", return_value="mock_comment")
+    @mock.patch(PATH + "d_issue.attach_link")
+    @mock.patch(PATH + "issue_link_exists", return_value=True)
+    def test_update_jira_issue_merged_pr_no_duplicate_transition(
+        self,
+        mock_issue_link_exists,
+        mock_attach_link,
+        mock_format_comment,
+        mock_comment_exists,
+        mock_change_status,
+    ):
+        """github.issues path: merged PR with status='Closed'.
+
+        merge_transition fires first (via _update_pr_transitions), then
+        _update_transition finds Jira already in target state and skips.
+        change_status is called once (for merge_transition) not twice.
+        """
+        self.mock_pr.suffix = "merged"
+        self.mock_pr.status = "Closed"
+        self.mock_pr.downstream = {
+            "pr_updates": [
+                {"merge_transition": "Closed"},
+                {"transition": "Closed"},
+            ],
+        }
+        self.mock_existing.fields.status.name = "Closed"
+
+        d.update_jira_issue(
+            self.mock_existing, self.mock_pr, self.mock_client, self.mock_config
+        )
+
+        # merge_transition fires via _update_pr_transition
+        mock_change_status.assert_called_once_with(
+            self.mock_client, self.mock_existing, "Closed", self.mock_pr
+        )
+
+    @mock.patch(PATH + "d_issue.change_status")
+    @mock.patch(PATH + "comment_exists", return_value=True)
+    @mock.patch(PATH + "format_comment", return_value="mock_comment")
+    @mock.patch(PATH + "d_issue.attach_link")
+    @mock.patch(PATH + "issue_link_exists", return_value=True)
+    def test_update_jira_issue_closed_without_merge_transitions(
+        self,
+        mock_issue_link_exists,
+        mock_attach_link,
+        mock_format_comment,
+        mock_comment_exists,
+        mock_change_status,
+    ):
+        """github.issues path: PR closed without merge, status='Closed'.
+
+        merge_transition skips (suffix is 'closed', not 'merged').
+        _update_transition sees status=='Closed' and fires, transitioning
+        the Jira issue — covering a case merge_transition cannot handle.
+        """
+        self.mock_pr.suffix = "closed"
+        self.mock_pr.status = "Closed"
+        self.mock_pr.url = "mock_url"
+        self.mock_pr.downstream = {
+            "pr_updates": [
+                {"merge_transition": "Closed"},
+                {"transition": "Closed"},
+            ],
+        }
+        self.mock_existing.fields.status.name = "Open"
+
+        d.update_jira_issue(
+            self.mock_existing, self.mock_pr, self.mock_client, self.mock_config
+        )
+
+        # Only _update_transition fires (merge_transition skipped)
+        mock_change_status.assert_called_once_with(
+            self.mock_client, self.mock_existing, "Closed", self.mock_pr
+        )
+
     @mock.patch(PATH + "update_jira")
     @mock.patch(PATH + "d_issue")
     def test_sync_with_jira_create_pr_issue_enabled(