rebase rework

backend/src/api/routes/__tests__/test_git_status_route.py

@@ -313,4 +313,128 @@ def test_pull_changes_applies_profile_identity_before_pull(monkeypatch):
     assert identity_service.pulled_dashboard_id == 12
 # [/DEF:test_pull_changes_applies_profile_identity_before_pull:Function]
 
+
+# [DEF:test_get_merge_status_returns_service_payload:Function]
+# @PURPOSE: Ensure merge status route returns service payload as-is.
+# @PRE: git_service.get_merge_status returns unfinished merge payload.
+# @POST: Route response contains has_unfinished_merge=True.
+def test_get_merge_status_returns_service_payload(monkeypatch):
+    class MergeStatusGitService:
+        def get_merge_status(self, dashboard_id: int) -> dict:
+            return {
+                "has_unfinished_merge": True,
+                "repository_path": "/tmp/repo-12",
+                "git_dir": "/tmp/repo-12/.git",
+                "current_branch": "dev",
+                "merge_head": "abc",
+                "merge_message_preview": "merge msg",
+                "conflicts_count": 2,
+            }
+
+    monkeypatch.setattr(git_routes, "git_service", MergeStatusGitService())
+    monkeypatch.setattr(git_routes, "_resolve_dashboard_id_from_ref", lambda *_args, **_kwargs: 12)
+
+    response = asyncio.run(
+        git_routes.get_merge_status(
+            "dashboard-12",
+            config_manager=MagicMock(),
+        )
+    )
+
+    assert response["has_unfinished_merge"] is True
+    assert response["conflicts_count"] == 2
+# [/DEF:test_get_merge_status_returns_service_payload:Function]
+
+
+# [DEF:test_resolve_merge_conflicts_passes_resolution_items_to_service:Function]
+# @PURPOSE: Ensure merge resolve route forwards parsed resolutions to service.
+# @PRE: resolve_data has one file strategy.
+# @POST: Service receives normalized list and route returns resolved files.
+def test_resolve_merge_conflicts_passes_resolution_items_to_service(monkeypatch):
+    captured = {}
+
+    class MergeResolveGitService:
+        def resolve_merge_conflicts(self, dashboard_id: int, resolutions):
+            captured["dashboard_id"] = dashboard_id
+            captured["resolutions"] = resolutions
+            return ["dashboards/a.yaml"]
+
+    class ResolveData:
+        class _Resolution:
+            def dict(self):
+                return {"file_path": "dashboards/a.yaml", "resolution": "mine", "content": None}
+
+        resolutions = [_Resolution()]
+
+    monkeypatch.setattr(git_routes, "git_service", MergeResolveGitService())
+    monkeypatch.setattr(git_routes, "_resolve_dashboard_id_from_ref", lambda *_args, **_kwargs: 12)
+
+    response = asyncio.run(
+        git_routes.resolve_merge_conflicts(
+            "dashboard-12",
+            ResolveData(),
+            config_manager=MagicMock(),
+        )
+    )
+
+    assert captured["dashboard_id"] == 12
+    assert captured["resolutions"][0]["resolution"] == "mine"
+    assert response["resolved_files"] == ["dashboards/a.yaml"]
+# [/DEF:test_resolve_merge_conflicts_passes_resolution_items_to_service:Function]
+
+
+# [DEF:test_abort_merge_calls_service_and_returns_result:Function]
+# @PURPOSE: Ensure abort route delegates to service.
+# @PRE: Service abort_merge returns aborted status.
+# @POST: Route returns aborted status.
+def test_abort_merge_calls_service_and_returns_result(monkeypatch):
+    class AbortGitService:
+        def abort_merge(self, dashboard_id: int):
+            assert dashboard_id == 12
+            return {"status": "aborted"}
+
+    monkeypatch.setattr(git_routes, "git_service", AbortGitService())
+    monkeypatch.setattr(git_routes, "_resolve_dashboard_id_from_ref", lambda *_args, **_kwargs: 12)
+
+    response = asyncio.run(
+        git_routes.abort_merge(
+            "dashboard-12",
+            config_manager=MagicMock(),
+        )
+    )
+
+    assert response["status"] == "aborted"
+# [/DEF:test_abort_merge_calls_service_and_returns_result:Function]
+
+
+# [DEF:test_continue_merge_passes_message_and_returns_commit:Function]
+# @PURPOSE: Ensure continue route passes commit message to service.
+# @PRE: continue_data.message is provided.
+# @POST: Route returns committed status and hash.
+def test_continue_merge_passes_message_and_returns_commit(monkeypatch):
+    class ContinueGitService:
+        def continue_merge(self, dashboard_id: int, message: str):
+            assert dashboard_id == 12
+            assert message == "Resolve all conflicts"
+            return {"status": "committed", "commit_hash": "abc123"}
+
+    class ContinueData:
+        message = "Resolve all conflicts"
+
+    monkeypatch.setattr(git_routes, "git_service", ContinueGitService())
+    monkeypatch.setattr(git_routes, "_resolve_dashboard_id_from_ref", lambda *_args, **_kwargs: 12)
+
+    response = asyncio.run(
+        git_routes.continue_merge(
+            "dashboard-12",
+            ContinueData(),
+            config_manager=MagicMock(),
+        )
+    )
+
+    assert response["status"] == "committed"
+    assert response["commit_hash"] == "abc123"
+# [/DEF:test_continue_merge_passes_message_and_returns_commit:Function]
+
+
 # [/DEF:backend.src.api.routes.__tests__.test_git_status_route:Module]