diff --git a/tcms/issuetracker/tests/test_gitlab_com.py b/tcms/issuetracker/tests/test_gitlab_com.py index 8902df0601..f92f0affda 100644 --- a/tcms/issuetracker/tests/test_gitlab_com.py +++ b/tcms/issuetracker/tests/test_gitlab_com.py @@ -50,8 +50,11 @@ def test_bug_id_from_url(self): def test_details_for_public_url(self): result = self.integration.details(self.existing_bug_url) - self.assertEqual("Hello GitLab Hosted", result["title"]) + self.assertEqual(self.existing_bug_id, result["id"]) self.assertEqual("Here we start testing.", result["description"]) + self.assertEqual("opened", result["status"]) + self.assertEqual("Hello GitLab Hosted", result["title"]) + self.assertEqual(self.existing_bug_url, result["url"]) def test_details_for_private_url(self): bug_system = BugSystem.objects.create( # nosec:B106:hardcoded_password_funcarg @@ -65,8 +68,13 @@ def test_details_for_private_url(self): result = integration.details("https://gitlab.com/kiwitcms/katinar/-/issues/1") - self.assertEqual("Hello Private GitLab", result["title"]) + self.assertEqual(1, result["id"]) self.assertEqual("Hello World", result["description"]) + self.assertEqual("closed", result["status"]) + self.assertEqual("Hello Private GitLab", result["title"]) + self.assertEqual( + "https://gitlab.com/kiwitcms/katinar/-/issues/1", result["url"] + ) def test_auto_update_bugtracker(self): repo_id = self.integration.repo_id diff --git a/tcms/issuetracker/tests/test_gitlab_ee.py b/tcms/issuetracker/tests/test_gitlab_ee.py index 5a5ce694de..6b89829292 100644 --- a/tcms/issuetracker/tests/test_gitlab_ee.py +++ b/tcms/issuetracker/tests/test_gitlab_ee.py @@ -107,8 +107,13 @@ def test_details_for_private_url(self): "http://bugtracker.kiwitcms.org/root/katinar/-/issues/1" ) - self.assertEqual("Hello Private Issue", result["title"]) + self.assertEqual(1, result["id"]) self.assertEqual("Created in secret via CLI", result["description"]) + self.assertEqual("opened", result["status"]) + self.assertEqual("Hello Private Issue", result["title"]) + self.assertEqual( + "http://bugtracker.kiwitcms.org/root/katinar/-/issues/1", result["url"] + ) def test_auto_update_bugtracker(self): repo_id = self.integration.repo_id diff --git a/tcms/issuetracker/types.py b/tcms/issuetracker/types.py index b922a83310..c4bcb9fdbb 100644 --- a/tcms/issuetracker/types.py +++ b/tcms/issuetracker/types.py @@ -311,10 +311,14 @@ def details(self, url): details b/c it will work for both public and private URLs. """ project = self.rpc.projects.get(self.repo_id) - issue = project.issues.get(self.bug_id_from_url(url)) + issue_id = self.bug_id_from_url(url) + issue = project.issues.get(issue_id) return { - "title": issue.title, + "id": issue_id, "description": issue.description, + "status": issue.state, + "title": issue.title, + "url": url, } @property