tests(start_directory) Improve checks

tony · tony · commit 8483a5b01938 · 2025-05-26T11:36:03.000-05:00
what:
- Added monkeypatching to change the current working directory to tmp_path in test cases.
- Simplified assertions for current path checks by removing unnecessary conditional statements.
- Ensured consistency in handling expected paths across test files: test_pane.py, test_server.py, test_session.py, and test_window.py.
diff --git a/tests/test_pane.py b/tests/test_pane.py
@@ -382,10 +382,13 @@ def test_split_start_directory(
     start_directory: StrPath | None,
     description: str,
     session: Session,
+    monkeypatch: pytest.MonkeyPatch,
     tmp_path: pathlib.Path,
     user_path: pathlib.Path,
 ) -> None:
     """Test Pane.split start_directory parameter handling."""
+    monkeypatch.chdir(tmp_path)
+
     window = session.new_window(window_name=f"test_split_{test_id}")
     pane = window.active_pane
     assert pane is not None
@@ -415,9 +418,9 @@ def test_split_start_directory(
     # 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
+        assert new_pane.pane_current_path is not None
+        actual_path = str(pathlib.Path(new_pane.pane_current_path).resolve())
+        assert actual_path == expected_path
 
 
 def test_split_start_directory_pathlib(
@@ -436,7 +439,7 @@ def test_split_start_directory_pathlib(
 
     # 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
+    assert new_pane.pane_current_path is not None
+    actual_path = str(pathlib.Path(new_pane.pane_current_path).resolve())
+    expected_path = str(user_path.resolve())
+    assert actual_path == expected_path
diff --git a/tests/test_server.py b/tests/test_server.py
@@ -354,10 +354,13 @@ def test_new_session_start_directory(
     start_directory: StrPath | None,
     description: str,
     server: Server,
+    monkeypatch: pytest.MonkeyPatch,
     tmp_path: pathlib.Path,
     user_path: pathlib.Path,
 ) -> None:
     """Test Server.new_session start_directory parameter handling."""
+    monkeypatch.chdir(tmp_path)
+
     # Format path placeholders with actual fixture values
     actual_start_directory = start_directory
     expected_path = None
@@ -388,9 +391,9 @@ def test_new_session_start_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())
-            assert actual_path == expected_path
+        assert active_pane.pane_current_path is not None
+        actual_path = str(pathlib.Path(active_pane.pane_current_path).resolve())
+        assert actual_path == expected_path
 
 
 def test_new_session_start_directory_pathlib(
@@ -410,7 +413,7 @@ def test_new_session_start_directory_pathlib(
     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
+    assert active_pane.pane_current_path is not None
+    actual_path = str(pathlib.Path(active_pane.pane_current_path).resolve())
+    expected_path = str(user_path.resolve())
+    assert actual_path == expected_path
diff --git a/tests/test_session.py b/tests/test_session.py
@@ -477,10 +477,13 @@ def test_new_window_start_directory(
     start_directory: StrPath | None,
     description: str,
     session: Session,
+    monkeypatch: pytest.MonkeyPatch,
     tmp_path: pathlib.Path,
     user_path: pathlib.Path,
 ) -> None:
     """Test Session.new_window start_directory parameter handling."""
+    monkeypatch.chdir(tmp_path)
+
     # Format path placeholders with actual fixture values
     actual_start_directory = start_directory
     expected_path = None
@@ -511,9 +514,9 @@ def test_new_window_start_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())
-            assert actual_path == expected_path
+        assert active_pane.pane_current_path is not None
+        actual_path = str(pathlib.Path(active_pane.pane_current_path).resolve())
+        assert actual_path == expected_path
 
 
 def test_new_window_start_directory_pathlib(
@@ -533,7 +536,7 @@ def test_new_window_start_directory_pathlib(
     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
+    assert active_pane.pane_current_path is not None
+    actual_path = str(pathlib.Path(active_pane.pane_current_path).resolve())
+    expected_path = str(user_path.resolve())
+    assert actual_path == expected_path
diff --git a/tests/test_window.py b/tests/test_window.py
@@ -699,10 +699,13 @@ def test_split_start_directory(
     start_directory: StrPath | None,
     description: str,
     session: Session,
+    monkeypatch: pytest.MonkeyPatch,
     tmp_path: pathlib.Path,
     user_path: pathlib.Path,
 ) -> None:
     """Test Window.split start_directory parameter handling."""
+    monkeypatch.chdir(tmp_path)
+
     window = session.new_window(window_name=f"test_window_split_{test_id}")
 
     # Format path placeholders with actual fixture values
@@ -730,9 +733,9 @@ def test_split_start_directory(
     # 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
+        assert new_pane.pane_current_path is not None
+        actual_path = str(pathlib.Path(new_pane.pane_current_path).resolve())
+        assert actual_path == expected_path
 
 
 def test_split_start_directory_pathlib(
@@ -749,7 +752,7 @@ def test_split_start_directory_pathlib(
 
     # 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
+    assert new_pane.pane_current_path is not None
+    actual_path = str(pathlib.Path(new_pane.pane_current_path).resolve())
+    expected_path = str(user_path.resolve())
+    assert actual_path == expected_path
