chore: auto release commit (2026-07-03 18:50:07)

examples/simulator_browser_rpa/tests/test_adapter_dispatch.py

@@ -42,20 +42,20 @@ class TestAdapterDispatch(unittest.TestCase):
             self.assertIsInstance(select_adapter(), SimulatorBrowserRpaAdapter)
 
 
-class TestMockAdapter(unittest.TestCase):
-    def test_mock_success(self) -> None:
+class TestMockAdapter(unittest.IsolatedAsyncioTestCase):
+    async def test_mock_success(self) -> None:
         items = [
             BatchItem(row_index=1, name="Alice", account="1001", amount=10.5),
             BatchItem(row_index=2, name="Bob", account="1002", amount=20.0),
         ]
-        result = MockBatchAdapter().submit_batch("acct-demo-001", items)
+        result = await MockBatchAdapter().submit_batch("acct-demo-001", items)
         self.assertTrue(result.ok)
         self.assertEqual(result.submitted_count, 2)
         self.assertEqual(result.submitted_amount, 30.5)
         self.assertTrue((result.batch_id or "").startswith("MOCK-"))
 
-    def test_mock_empty_items(self) -> None:
-        result = MockBatchAdapter().submit_batch("acct-demo-001", [])
+    async def test_mock_empty_items(self) -> None:
+        result = await MockBatchAdapter().submit_batch("acct-demo-001", [])
         self.assertFalse(result.ok)
         self.assertEqual(result.error_msg, "items 为空")
 

examples/simulator_browser_rpa/tests/test_no_rpa_helpers_import.py

@@ -0,0 +1,39 @@
+# -*- coding: utf-8 -*-
+"""禁止 import account-manager 内部 RPA 辅助模块。"""
+from __future__ import annotations
+
+import os
+import re
+import unittest
+from pathlib import Path
+
+FORBIDDEN_PATTERNS = (
+    re.compile(r"\brpa_helpers\b"),
+    re.compile(r"\binject_account_manager_scripts_path\b"),
+    re.compile(r"\bget_account_credential\b"),
+)
+
+SCRIPTS_ROOT = Path(__file__).resolve().parents[1] / "scripts"
+
+
+class TestNoRpaHelpersImport(unittest.TestCase):
+    def test_scripts_tree_has_no_forbidden_account_manager_imports(self) -> None:
+        violations: list[str] = []
+        for root, _dirs, files in os.walk(SCRIPTS_ROOT):
+            for name in files:
+                if not name.endswith(".py"):
+                    continue
+                path = Path(root) / name
+                text = path.read_text(encoding="utf-8")
+                for pattern in FORBIDDEN_PATTERNS:
+                    if pattern.search(text):
+                        violations.append(f"{path.relative_to(SCRIPTS_ROOT)}: {pattern.pattern}")
+        self.assertEqual(
+            violations,
+            [],
+            msg="Forbidden account-manager internal imports found:\n" + "\n".join(violations),
+        )
+
+
+if __name__ == "__main__":
+    unittest.main()

examples/simulator_browser_rpa/tests/test_simulator_rpa_unit.py

@@ -2,31 +2,27 @@
 """SimulatorBrowserRpaAdapter 单元测试（不启动真实浏览器）。"""
 from __future__ import annotations
 
+import asyncio
 import unittest
-from unittest.mock import MagicMock, patch
+from unittest.mock import AsyncMock, MagicMock, patch
 
 from service.adapter import BatchItem, SimulatorBrowserRpaAdapter
 from service.browser_session import CHROME_LAUNCH_ARGS
+from service.simulator_playwright import RpaError
 
 
-class TestSimulatorRpaUnit(unittest.TestCase):
-    def test_set_credentials_and_empty_profile_dir(self) -> None:
+class TestSimulatorRpaUnit(unittest.IsolatedAsyncioTestCase):
+    async def test_submit_batch_empty_items(self) -> None:
         adapter = SimulatorBrowserRpaAdapter()
-        adapter.set_credentials("demo001", "pwd", "pin", "   ")
-        self.assertEqual(adapter._login_id, "demo001")
-        self.assertIsNone(adapter._profile_dir)
-
-    def test_submit_batch_empty_items(self) -> None:
-        adapter = SimulatorBrowserRpaAdapter()
-        result = adapter.submit_batch("acct-demo-001", [])
+        result = await adapter.submit_batch("acct-demo-001", [])
         self.assertFalse(result.ok)
         self.assertIn("items", result.error_msg or "")
 
     @patch("service.adapter.simulator_rpa.find_chrome_executable", return_value=None)
-    def test_no_chrome_returns_error_without_launch(self, _chrome: MagicMock) -> None:
+    async def test_no_chrome_returns_error_without_launch(self, _chrome: MagicMock) -> None:
         adapter = SimulatorBrowserRpaAdapter()
         items = [BatchItem(row_index=1, name="A", account="1", amount=1.0)]
-        result = adapter.submit_batch("acct-demo-001", items)
+        result = await adapter.submit_batch("acct-demo-001", items)
         self.assertFalse(result.ok)
         msg = result.error_msg or ""
         self.assertTrue("Chrome" in msg or "Edge" in msg or "浏览器" in msg)
@@ -38,38 +34,100 @@ class TestSimulatorRpaUnit(unittest.TestCase):
             self.assertFalse(lowered.startswith("https://"))
             self.assertFalse(lowered.startswith("file://"))
 
-    @patch("service.adapter.simulator_rpa.browser_session")
+    @patch("service.adapter.simulator_rpa.submit_batch_rpa", new_callable=AsyncMock)
+    @patch("service.adapter.simulator_rpa.pick_web_account")
     @patch("service.adapter.simulator_rpa.find_chrome_executable", return_value="C:/Chrome/chrome.exe")
-    def test_start_url_opened_via_goto_not_launch_args(
+    async def test_adapter_delegates_to_playwright_with_account_url(
         self,
         _chrome: MagicMock,
-        mock_session: MagicMock,
+        mock_pick: MagicMock,
+        mock_rpa: AsyncMock,
     ) -> None:
-        from service.adapter.simulator_rpa import RpaError
+        from service.adapter.base import BatchSubmitResult
 
-        adapter = SimulatorBrowserRpaAdapter(base_url="file:///demo/demo_app.html")
+        mock_pick.return_value = {
+            "login_id": "demo001",
+            "profile_dir": "/tmp/profile",
+            "url": "file:///demo/demo_app.html",
+            "lease_token": "tok-1",
+        }
+        mock_rpa.return_value = BatchSubmitResult(
+            ok=False,
+            batch_id=None,
+            submitted_count=0,
+            submitted_amount=0.0,
+            error_msg="login fail",
+            artifacts={"adapter": "simulator_rpa"},
+        )
+
+        adapter = SimulatorBrowserRpaAdapter(artifacts_dir="/tmp/art")
         items = [BatchItem(row_index=1, name="A", account="1", amount=1.0)]
-
-        page = MagicMock()
-        mock_cm = MagicMock()
-        mock_cm.__enter__.return_value = page
-        mock_cm.__exit__.return_value = False
-        mock_session.return_value = mock_cm
-
-        with patch.object(adapter, "_login", side_effect=RpaError("login fail")):
-            result = adapter.submit_batch("acct-demo-001", items)
+        result = await adapter.submit_batch("acct-demo-001", items)
 
         self.assertFalse(result.ok)
-        mock_session.assert_called_once()
-        called_start_url = mock_session.call_args[0][0]
-        self.assertEqual(called_start_url, "file:///demo/demo_app.html")
+        mock_rpa.assert_awaited_once()
+        call_kwargs = mock_rpa.call_args.kwargs
+        self.assertEqual(call_kwargs["base_url"], "file:///demo/demo_app.html")
         for arg in CHROME_LAUNCH_ARGS:
-            self.assertNotIn(arg, called_start_url)
+            self.assertNotIn(arg, call_kwargs["base_url"])
 
-    def test_safe_screenshot_without_artifacts_dir(self) -> None:
-        adapter = SimulatorBrowserRpaAdapter(artifacts_dir=None)
-        page = MagicMock()
-        self.assertIsNone(adapter._safe_screenshot(page, "tag"))
+    @patch("service.simulator_playwright.start_browser_session", new_callable=AsyncMock)
+    async def test_playwright_opens_url_via_goto_not_launch_args(self, mock_start: AsyncMock) -> None:
+        from service.simulator_playwright import submit_batch_rpa
+
+        page = AsyncMock()
+        page.goto = AsyncMock()
+        mock_start.return_value = (MagicMock(), MagicMock(), page)
+
+        account = {"profile_dir": "/tmp/p", "login_id": "demo001"}
+        items = [BatchItem(row_index=1, name="A", account="1", amount=1.0)]
+
+        with patch(
+            "service.simulator_playwright._wait_portal_gate",
+            new_callable=AsyncMock,
+            return_value=None,
+        ):
+            with patch(
+                "service.simulator_playwright._login",
+                new_callable=AsyncMock,
+                side_effect=RpaError("login fail"),
+            ):
+                with patch(
+                    "service.simulator_playwright.find_chrome_executable",
+                    return_value="C:/Chrome/chrome.exe",
+                ):
+                    with patch(
+                        "service.simulator_playwright.close_browser_session",
+                        new_callable=AsyncMock,
+                    ):
+                        result = await submit_batch_rpa(
+                            account,
+                            target="acct-demo-001",
+                            items=items,
+                            base_url="file:///demo/demo_app.html",
+                            artifacts_dir=None,
+                        )
+
+        self.assertFalse(result.ok)
+        page.goto.assert_awaited_once()
+        goto_url = page.goto.call_args[0][0]
+        self.assertEqual(goto_url, "file:///demo/demo_app.html")
+        for arg in CHROME_LAUNCH_ARGS:
+            self.assertNotIn(arg, goto_url)
+
+    async def test_safe_screenshot_without_artifacts_dir(self) -> None:
+        from service.simulator_playwright import _safe_screenshot
+
+        page = AsyncMock()
+        self.assertIsNone(await _safe_screenshot(page, None, "tag"))
+
+
+class TestSyncHelpers(unittest.TestCase):
+    def test_asyncio_run_smoke(self) -> None:
+        async def _noop() -> bool:
+            return True
+
+        self.assertTrue(asyncio.run(_noop()))
 
 
 if __name__ == "__main__":

examples/simulator_browser_rpa/tests/test_stop_reason.py

@@ -3,51 +3,70 @@
 from __future__ import annotations
 
 import unittest
-from unittest.mock import MagicMock, patch
+from unittest.mock import AsyncMock, MagicMock, patch
 
 from service.adapter import BatchItem, SimulatorBrowserRpaAdapter
-from service.adapter.simulator_rpa import RpaError
+from service.adapter.base import BatchSubmitResult
 
 
-class TestBatchSubmitFailureResult(unittest.TestCase):
+class TestBatchSubmitFailureResult(unittest.IsolatedAsyncioTestCase):
+    @patch("service.adapter.simulator_rpa.release_lease")
+    @patch("service.adapter.simulator_rpa.submit_batch_rpa", new_callable=AsyncMock)
+    @patch("service.adapter.simulator_rpa.pick_web_account")
     @patch("service.adapter.simulator_rpa.find_chrome_executable", return_value="C:/Chrome/chrome.exe")
-    @patch("service.adapter.simulator_rpa.browser_session")
-    def test_rpa_error_converts_to_failed_result(self, mock_session: MagicMock, _chrome: MagicMock) -> None:
-        page = MagicMock()
-        mock_cm = MagicMock()
-        mock_cm.__enter__.return_value = page
-        mock_cm.__exit__.return_value = False
-        mock_session.return_value = mock_cm
+    async def test_rpa_error_converts_to_failed_result(
+        self,
+        _chrome: MagicMock,
+        mock_pick: MagicMock,
+        mock_rpa: AsyncMock,
+        _release: MagicMock,
+    ) -> None:
+        mock_pick.return_value = {
+            "profile_dir": "/tmp/profile",
+            "lease_token": "tok",
+        }
+        mock_rpa.return_value = BatchSubmitResult(
+            ok=False,
+            batch_id=None,
+            submitted_count=0,
+            submitted_amount=0.0,
+            error_msg="登录第一步失败：timeout",
+            artifacts={"adapter": "simulator_rpa", "screenshot": "/tmp/art/x.png"},
+        )
 
         adapter = SimulatorBrowserRpaAdapter(artifacts_dir="/tmp/art")
         items = [BatchItem(row_index=1, name="A", account="1", amount=1.0)]
-
-        with patch.object(adapter, "_login", side_effect=RpaError("登录第一步失败：timeout", screenshot_path="/tmp/art/x.png")):
-            result = adapter.submit_batch("acct-demo-001", items)
+        result = await adapter.submit_batch("acct-demo-001", items)
 
         self.assertFalse(result.ok)
         self.assertIn("登录第一步失败", result.error_msg or "")
-        self.assertEqual(result.artifacts.get("adapter"), "simulator_browser_rpa")
+        self.assertEqual(result.artifacts.get("adapter"), "simulator_rpa")
         self.assertEqual(result.artifacts.get("screenshot"), "/tmp/art/x.png")
 
+    @patch("service.adapter.simulator_rpa.release_lease")
+    @patch("service.adapter.simulator_rpa.submit_batch_rpa", new_callable=AsyncMock)
+    @patch("service.adapter.simulator_rpa.pick_web_account")
     @patch("service.adapter.simulator_rpa.find_chrome_executable", return_value="C:/Chrome/chrome.exe")
-    @patch("service.adapter.simulator_rpa.browser_session")
-    def test_unexpected_error_includes_adapter_name(self, mock_session: MagicMock, _chrome: MagicMock) -> None:
-        page = MagicMock()
-        mock_cm = MagicMock()
-        mock_cm.__enter__.return_value = page
-        mock_cm.__exit__.return_value = False
-        mock_session.return_value = mock_cm
+    async def test_unexpected_error_includes_adapter_name(
+        self,
+        _chrome: MagicMock,
+        mock_pick: MagicMock,
+        mock_rpa: AsyncMock,
+        _release: MagicMock,
+    ) -> None:
+        mock_pick.return_value = {
+            "profile_dir": "/tmp/profile",
+            "lease_token": "tok",
+        }
+        mock_rpa.side_effect = RuntimeError("boom")
 
         adapter = SimulatorBrowserRpaAdapter(artifacts_dir=None)
         items = [BatchItem(row_index=1, name="A", account="1", amount=1.0)]
-
-        with patch.object(adapter, "_login", side_effect=RuntimeError("boom")):
-            result = adapter.submit_batch("acct-demo-001", items)
+        result = await adapter.submit_batch("acct-demo-001", items)
 
         self.assertFalse(result.ok)
         self.assertIn("未预期异常", result.error_msg or "")
-        self.assertEqual(result.artifacts.get("adapter"), "simulator_browser_rpa")
+        self.assertEqual(result.artifacts.get("adapter"), "simulator_rpa")
         self.assertNotIn("screenshot", result.artifacts)