fix: resolve merge conflict with fix/browser-navigate-wait-until

Co-authored-by: OhYee <13498329+OhYee@users.noreply.github.com>

Author: Copilot

tests/unittests/integration/test_browser_toolset_error_handling.py

@@ -523,30 +523,24 @@ def callback(sb):
 
 
 class TestBrowserNavigationDefaults:
-    """测试浏览器导航函数的默认参数 / Tests for browser navigation function defaults"""
-
-    def test_browser_navigate_back_default_wait_until_is_domcontentloaded(
-        self,
-    ):
-        """测试 browser_navigate_back 的 wait_until 默认值为 domcontentloaded"""
-        default = (
-            BrowserToolSet.browser_navigate_back.args_schema.model_fields[
-                "wait_until"
-            ].default
-        )
-        assert default == "domcontentloaded", (
-            f"Expected 'domcontentloaded' but got '{default}'"
-        )
-
-    def test_browser_go_forward_default_wait_until_is_domcontentloaded(
-        self,
-    ):
-        """测试 browser_go_forward 的 wait_until 默认值为 domcontentloaded"""
-        default = (
-            BrowserToolSet.browser_go_forward.args_schema.model_fields[
-                "wait_until"
-            ].default
-        )
-        assert default == "domcontentloaded", (
-            f"Expected 'domcontentloaded' but got '{default}'"
-        )
+    """测试导航方法的默认参数 / Tests for default parameters of navigation methods"""
+
+    def test_browser_navigate_back_default_wait_until(self):
+        """browser_navigate_back 的默认 wait_until 为 domcontentloaded"""
+        fields = BrowserToolSet.browser_navigate_back.args_schema.model_fields
+        assert fields["wait_until"].default == "domcontentloaded"
+
+    def test_browser_go_forward_default_wait_until(self):
+        """browser_go_forward 的默认 wait_until 为 domcontentloaded"""
+        fields = BrowserToolSet.browser_go_forward.args_schema.model_fields
+        assert fields["wait_until"].default == "domcontentloaded"
+
+    def test_browser_navigate_back_default_timeout_is_none(self):
+        """browser_navigate_back 的默认 timeout 为 None"""
+        fields = BrowserToolSet.browser_navigate_back.args_schema.model_fields
+        assert fields["timeout"].default is None
+
+    def test_browser_go_forward_default_timeout_is_none(self):
+        """browser_go_forward 的默认 timeout 为 None"""
+        fields = BrowserToolSet.browser_go_forward.args_schema.model_fields
+        assert fields["timeout"].default is None