tests(start_directory) Improve across multiple test files

what:
- Removed expected_in_cmd and expected_not_in_cmd from StartDirectoryTestFixture.
- Updated test cases to handle user_path and relative_path scenarios.
- Enhanced logic for formatting start_directory with actual paths in tests.
- Ensured compatibility with pathlib.Path for start_directory input across tests in test_pane.py, test_server.py, test_session.py, and test_window.py.

Author: tony

tests/test_pane.py

@@ -345,39 +345,29 @@ class StartDirectoryTestFixture(t.NamedTuple):
 
     test_id: str
     start_directory: StrPath | None
-    expected_in_cmd: list[str]
-    expected_not_in_cmd: list[str]
     description: str
 
 
 START_DIRECTORY_TEST_FIXTURES: list[StartDirectoryTestFixture] = [
     StartDirectoryTestFixture(
         test_id="none_value",
         start_directory=None,
-        expected_in_cmd=[],
-        expected_not_in_cmd=["-c"],
         description="None should not add -c flag",
     ),
     StartDirectoryTestFixture(
         test_id="empty_string",
         start_directory="",
-        expected_in_cmd=[],
-        expected_not_in_cmd=["-c"],
         description="Empty string should not add -c flag",
     ),
     StartDirectoryTestFixture(
-        test_id="absolute_path_string",
-        start_directory="/tmp/test",
-        expected_in_cmd=["-c"],
-        expected_not_in_cmd=[],
-        description="Absolute path string should add -c flag",
+        test_id="user_path",
+        start_directory="{user_path}",
+        description="User path should add -c flag",
     ),
     StartDirectoryTestFixture(
-        test_id="pathlib_absolute",
-        start_directory=pathlib.Path("/tmp/test"),
-        expected_in_cmd=["-c"],
-        expected_not_in_cmd=[],
-        description="pathlib.Path absolute should add -c flag",
+        test_id="relative_path",
+        start_directory="./relative/path",
+        description="Relative path should add -c flag",
     ),
 ]
 
@@ -390,37 +380,63 @@ class StartDirectoryTestFixture(t.NamedTuple):
 def test_split_start_directory(
     test_id: str,
     start_directory: StrPath | None,
-    expected_in_cmd: list[str],
-    expected_not_in_cmd: list[str],
     description: str,
     session: Session,
+    tmp_path: pathlib.Path,
+    user_path: pathlib.Path,
 ) -> None:
     """Test Pane.split start_directory parameter handling."""
     window = session.new_window(window_name=f"test_split_{test_id}")
     pane = window.active_pane
     assert pane is not None
 
-    # Split pane with start_directory parameter
-    new_pane = pane.split(start_directory=start_directory)
+    # Format path placeholders with actual fixture values
+    actual_start_directory = start_directory
+    expected_path = None
+
+    if start_directory and str(start_directory) not in ["", "None"]:
+        if "{user_path}" in str(start_directory):
+            # Replace placeholder with actual user_path
+            actual_start_directory = str(start_directory).format(user_path=user_path)
+            expected_path = str(user_path)
+        elif str(start_directory).startswith("./"):
+            # For relative paths, use tmp_path as base
+            temp_dir = tmp_path / "relative" / "path"
+            temp_dir.mkdir(parents=True, exist_ok=True)
+            actual_start_directory = str(temp_dir)
+            expected_path = str(temp_dir.resolve())
+
+    # Should not raise an error
+    new_pane = pane.split(start_directory=actual_start_directory)
 
-    # Verify pane was created successfully
     assert new_pane in window.panes
     assert len(window.panes) == 2
 
+    # Verify working directory if we have an expected path
+    if expected_path:
+        new_pane.refresh()
+        if new_pane.pane_current_path:
+            actual_path = str(pathlib.Path(new_pane.pane_current_path).resolve())
+            assert actual_path == expected_path
 
-def test_split_start_directory_pathlib(session: Session) -> None:
-    """Test Pane.split accepts pathlib.Path for start_directory."""
-    import tempfile
 
-    with tempfile.TemporaryDirectory() as temp_dir:
-        path_obj = pathlib.Path(temp_dir)
+def test_split_start_directory_pathlib(
+    session: Session, user_path: pathlib.Path
+) -> None:
+    """Test Pane.split accepts pathlib.Path for start_directory."""
+    window = session.new_window(window_name="test_split_pathlib")
+    pane = window.active_pane
+    assert pane is not None
 
-        window = session.new_window(window_name="test_split_pathlib")
-        pane = window.active_pane
-        assert pane is not None
+    # Pass pathlib.Path directly to test pathlib.Path acceptance
+    new_pane = pane.split(start_directory=user_path)
 
-        # Should accept pathlib.Path without error
-        new_pane = pane.split(start_directory=path_obj)
+    assert new_pane in window.panes
+    assert len(window.panes) == 2
 
-        assert new_pane in window.panes
-        assert len(window.panes) == 2
+    # Verify working directory
+    new_pane.refresh()
+    if new_pane.pane_current_path:
+        actual_path = str(pathlib.Path(new_pane.pane_current_path).resolve())
+        expected_path = str(user_path.resolve())
+        assert actual_path == expected_path

tests/test_server.py

@@ -317,39 +317,29 @@ class StartDirectoryTestFixture(t.NamedTuple):
 
     test_id: str
     start_directory: StrPath | None
-    expected_in_cmd: list[str]
-    expected_not_in_cmd: list[str]
     description: str
 
 
 START_DIRECTORY_TEST_FIXTURES: list[StartDirectoryTestFixture] = [
     StartDirectoryTestFixture(
         test_id="none_value",
         start_directory=None,
-        expected_in_cmd=[],
-        expected_not_in_cmd=["-c"],
         description="None should not add -c flag",
     ),
     StartDirectoryTestFixture(
         test_id="empty_string",
         start_directory="",
-        expected_in_cmd=[],
-        expected_not_in_cmd=["-c"],
         description="Empty string should not add -c flag",
     ),
     StartDirectoryTestFixture(
-        test_id="absolute_path_string",
-        start_directory="/tmp/test",
-        expected_in_cmd=["-c", "/tmp/test"],
-        expected_not_in_cmd=[],
-        description="Absolute path string should add -c flag",
+        test_id="user_path",
+        start_directory="{user_path}",
+        description="User path should add -c flag",
     ),
     StartDirectoryTestFixture(
-        test_id="pathlib_absolute",
-        start_directory=pathlib.Path("/tmp/test"),
-        expected_in_cmd=["-c", "/tmp/test"],
-        expected_not_in_cmd=[],
-        description="pathlib.Path absolute should add -c flag",
+        test_id="relative_path",
+        start_directory="./relative/path",
+        description="Relative path should add -c flag",
     ),
 ]
 
@@ -362,35 +352,65 @@ class StartDirectoryTestFixture(t.NamedTuple):
 def test_new_session_start_directory(
     test_id: str,
     start_directory: StrPath | None,
-    expected_in_cmd: list[str],
-    expected_not_in_cmd: list[str],
     description: str,
     server: Server,
+    tmp_path: pathlib.Path,
+    user_path: pathlib.Path,
 ) -> None:
     """Test Server.new_session start_directory parameter handling."""
-    # Create session with start_directory parameter
+    # Format path placeholders with actual fixture values
+    actual_start_directory = start_directory
+    expected_path = None
+
+    if start_directory and str(start_directory) not in ["", "None"]:
+        if "{user_path}" in str(start_directory):
+            # Replace placeholder with actual user_path
+            actual_start_directory = str(start_directory).format(user_path=user_path)
+            expected_path = str(user_path)
+        elif str(start_directory).startswith("./"):
+            # For relative paths, use tmp_path as base
+            temp_dir = tmp_path / "relative" / "path"
+            temp_dir.mkdir(parents=True, exist_ok=True)
+            actual_start_directory = str(temp_dir)
+            expected_path = str(temp_dir.resolve())
+
+    # Should not raise an error
     session = server.new_session(
-        session_name=f"test_start_dir_{test_id}",
-        start_directory=start_directory,
+        session_name=f"test_session_{test_id}",
+        start_directory=actual_start_directory,
     )
 
-    # Verify session was created successfully
-    assert session.session_name == f"test_start_dir_{test_id}"
-    assert server.has_session(f"test_start_dir_{test_id}")
+    assert session.session_name == f"test_session_{test_id}"
+    assert server.has_session(f"test_session_{test_id}")
 
+    # Verify working directory if we have an expected path
+    if expected_path:
+        active_pane = session.active_window.active_pane
+        assert active_pane is not None
+        active_pane.refresh()
+        if active_pane.pane_current_path:
+            actual_path = str(pathlib.Path(active_pane.pane_current_path).resolve())
+            assert actual_path == expected_path
 
-def test_new_session_start_directory_pathlib(server: Server) -> None:
-    """Test Server.new_session accepts pathlib.Path for start_directory."""
-    import tempfile
-
-    with tempfile.TemporaryDirectory() as temp_dir:
-        path_obj = pathlib.Path(temp_dir)
 
-        # Should accept pathlib.Path without error
-        session = server.new_session(
-            session_name="test_pathlib_start_dir",
-            start_directory=path_obj,
-        )
+def test_new_session_start_directory_pathlib(
+    server: Server, user_path: pathlib.Path
+) -> None:
+    """Test Server.new_session accepts pathlib.Path for start_directory."""
+    # Pass pathlib.Path directly to test pathlib.Path acceptance
+    session = server.new_session(
+        session_name="test_pathlib_start_dir",
+        start_directory=user_path,
+    )
 
-        assert session.session_name == "test_pathlib_start_dir"
-        assert server.has_session("test_pathlib_start_dir")
+    assert session.session_name == "test_pathlib_start_dir"
+    assert server.has_session("test_pathlib_start_dir")
+
+    # Verify working directory
+    active_pane = session.active_window.active_pane
+    assert active_pane is not None
+    active_pane.refresh()
+    if active_pane.pane_current_path:
+        actual_path = str(pathlib.Path(active_pane.pane_current_path).resolve())
+        expected_path = str(user_path.resolve())
+        assert actual_path == expected_path

tests/test_session.py

@@ -440,39 +440,29 @@ class StartDirectoryTestFixture(t.NamedTuple):
 
     test_id: str
     start_directory: StrPath | None
-    expected_in_cmd: list[str]
-    expected_not_in_cmd: list[str]
     description: str
 
 
 START_DIRECTORY_TEST_FIXTURES: list[StartDirectoryTestFixture] = [
     StartDirectoryTestFixture(
         test_id="none_value",
         start_directory=None,
-        expected_in_cmd=[],
-        expected_not_in_cmd=["-c"],
         description="None should not add -c flag",
     ),
     StartDirectoryTestFixture(
         test_id="empty_string",
         start_directory="",
-        expected_in_cmd=[],
-        expected_not_in_cmd=["-c"],
         description="Empty string should not add -c flag",
     ),
     StartDirectoryTestFixture(
-        test_id="absolute_path_string",
-        start_directory="/tmp/test",
-        expected_in_cmd=["-c"],
-        expected_not_in_cmd=[],
-        description="Absolute path string should add -c flag",
+        test_id="user_path",
+        start_directory="{user_path}",
+        description="User path should add -c flag",
     ),
     StartDirectoryTestFixture(
-        test_id="pathlib_absolute",
-        start_directory=pathlib.Path("/tmp/test"),
-        expected_in_cmd=["-c"],
-        expected_not_in_cmd=[],
-        description="pathlib.Path absolute should add -c flag",
+        test_id="relative_path",
+        start_directory="./relative/path",
+        description="Relative path should add -c flag",
     ),
 ]
 
@@ -485,35 +475,65 @@ class StartDirectoryTestFixture(t.NamedTuple):
 def test_new_window_start_directory(
     test_id: str,
     start_directory: StrPath | None,
-    expected_in_cmd: list[str],
-    expected_not_in_cmd: list[str],
     description: str,
     session: Session,
+    tmp_path: pathlib.Path,
+    user_path: pathlib.Path,
 ) -> None:
     """Test Session.new_window start_directory parameter handling."""
-    # Create window with start_directory parameter
+    # Format path placeholders with actual fixture values
+    actual_start_directory = start_directory
+    expected_path = None
+
+    if start_directory and str(start_directory) not in ["", "None"]:
+        if "{user_path}" in str(start_directory):
+            # Replace placeholder with actual user_path
+            actual_start_directory = str(start_directory).format(user_path=user_path)
+            expected_path = str(user_path)
+        elif str(start_directory).startswith("./"):
+            # For relative paths, use tmp_path as base
+            temp_dir = tmp_path / "relative" / "path"
+            temp_dir.mkdir(parents=True, exist_ok=True)
+            actual_start_directory = str(temp_dir)
+            expected_path = str(temp_dir.resolve())
+
+    # Should not raise an error
     window = session.new_window(
-        window_name=f"test_start_dir_{test_id}",
-        start_directory=start_directory,
+        window_name=f"test_window_{test_id}",
+        start_directory=actual_start_directory,
     )
 
-    # Verify window was created successfully
-    assert window.window_name == f"test_start_dir_{test_id}"
+    assert window.window_name == f"test_window_{test_id}"
     assert window in session.windows
 
+    # Verify working directory if we have an expected path
+    if expected_path:
+        active_pane = window.active_pane
+        assert active_pane is not None
+        active_pane.refresh()
+        if active_pane.pane_current_path:
+            actual_path = str(pathlib.Path(active_pane.pane_current_path).resolve())
+            assert actual_path == expected_path
 
-def test_new_window_start_directory_pathlib(session: Session) -> None:
-    """Test Session.new_window accepts pathlib.Path for start_directory."""
-    import tempfile
 
-    with tempfile.TemporaryDirectory() as temp_dir:
-        path_obj = pathlib.Path(temp_dir)
+def test_new_window_start_directory_pathlib(
+    session: Session, user_path: pathlib.Path
+) -> None:
+    """Test Session.new_window accepts pathlib.Path for start_directory."""
+    # Pass pathlib.Path directly to test pathlib.Path acceptance
+    window = session.new_window(
+        window_name="test_pathlib_start_dir",
+        start_directory=user_path,
+    )
 
-        # Should accept pathlib.Path without error
-        window = session.new_window(
-            window_name="test_pathlib_start_dir",
-            start_directory=path_obj,
-        )
+    assert window.window_name == "test_pathlib_start_dir"
+    assert window in session.windows
 
-        assert window.window_name == "test_pathlib_start_dir"
-        assert window in session.windows
+    # Verify working directory
+    active_pane = window.active_pane
+    assert active_pane is not None
+    active_pane.refresh()
+    if active_pane.pane_current_path:
+        actual_path = str(pathlib.Path(active_pane.pane_current_path).resolve())
+        expected_path = str(user_path.resolve())
+        assert actual_path == expected_path