Merge pull request #523 from staticdev/bug/rollback-failed-merge-prs

Fix rollback on failed merge PR

Author: staticdev

src/git_portfolio/use_cases/gh_merge_pr.py

@@ -15,7 +15,7 @@ def action(  # type: ignore[override]
         """Merge pull requests."""
         github_service_method = "merge_pull_request_from_repo"
         self.call_github_service(github_service_method, github_repo, pr_merge)
-        if pr_merge.delete_branch:
+        if pr_merge.delete_branch and not self.error:
             delete_branch_use_case = dbr.GhDeleteBranchUseCase(
                 self.config_manager, self.github_service
             )

tests/use_cases/test_gh_merge_pr.py

@@ -56,6 +56,7 @@ def test_action(
     config_manager = mock_config_manager.return_value
     github_service = mock_github_service.return_value
     use_case = ghmp.GhMergePrUseCase(config_manager, github_service)
+
     use_case.action(REPO, domain_mprs[0])
 
     assert "success message\n" == use_case.output
@@ -71,12 +72,30 @@ def test_action_delete_branch(
     config_manager = mock_config_manager.return_value
     github_service = mock_github_service.return_value
     use_case = ghmp.GhMergePrUseCase(config_manager, github_service)
+
     use_case.action(REPO, domain_mprs[1])
 
     assert "success message\n" == use_case.output
     mock_gh_delete_branch_use_case.assert_called_once()
 
 
+def test_action_delete_branch_with_error(
+    mock_config_manager: MockerFixture,
+    mock_github_service: MockerFixture,
+    mock_gh_delete_branch_use_case: MockerFixture,
+    domain_mprs: list[mpr.PullRequestMerge],
+) -> None:
+    """It returns does not call delete branch."""
+    config_manager = mock_config_manager.return_value
+    github_service = mock_github_service.return_value
+    use_case = ghmp.GhMergePrUseCase(config_manager, github_service)
+    use_case.error = True
+
+    use_case.action(REPO, domain_mprs[1])
+
+    assert not mock_gh_delete_branch_use_case.called
+
+
 @pytest.mark.integration
 def test_action_delete_branch_integration(
     mock_config_manager: MockerFixture,
@@ -87,6 +106,7 @@ def test_action_delete_branch_integration(
     config_manager = mock_config_manager.return_value
     github_service = mock_github_service.return_value
     use_case = ghmp.GhMergePrUseCase(config_manager, github_service)
+
     use_case.action(REPO, domain_mprs[1])
 
     assert "success message\n" == use_case.output