Update snapshots, add ability to pass App instance into snap_compare

darrenburns · Jul 21, 2024 · 1c34986 · 1c34986
1 parent ac9e38b
commit 1c34986
Show file tree

Hide file tree

Showing 28 changed files with 2,554 additions and 2,563 deletions.
diff --git a/.coverage b/.coverage
diff --git a/...apshots__/test_snapshots/TestCommandPalette.test_can_type_to_filter_options.svg b/...apshots__/test_snapshots/TestCommandPalette.test_can_type_to_filter_options.svg
diff --git a/...__/test_snapshots/TestCommandPalette.test_loads_and_shows_discovery_options.svg b/...__/test_snapshots/TestCommandPalette.test_loads_and_shows_discovery_options.svg
diff --git a/tests/__snapshots__/test_snapshots/TestConfig.test_config.svg b/tests/__snapshots__/test_snapshots/TestConfig.test_config.svg
diff --git a/tests/__snapshots__/test_snapshots/TestHelpScreen.test_help_screen_appears.svg b/tests/__snapshots__/test_snapshots/TestHelpScreen.test_help_screen_appears.svg
diff --git a/tests/__snapshots__/test_snapshots/TestJumpMode.test_click_switch.svg b/tests/__snapshots__/test_snapshots/TestJumpMode.test_click_switch.svg
diff --git a/tests/__snapshots__/test_snapshots/TestJumpMode.test_focus_switch.svg b/tests/__snapshots__/test_snapshots/TestJumpMode.test_focus_switch.svg
diff --git a/tests/__snapshots__/test_snapshots/TestJumpMode.test_loads.svg b/tests/__snapshots__/test_snapshots/TestJumpMode.test_loads.svg
diff --git a/...ots__/test_snapshots/TestLoadingRequest.test_request_loaded_into_view__auth.svg b/...ots__/test_snapshots/TestLoadingRequest.test_request_loaded_into_view__auth.svg
diff --git a/...ots__/test_snapshots/TestLoadingRequest.test_request_loaded_into_view__body.svg b/...ots__/test_snapshots/TestLoadingRequest.test_request_loaded_into_view__body.svg
diff --git a/...__/test_snapshots/TestLoadingRequest.test_request_loaded_into_view__headers.svg b/...__/test_snapshots/TestLoadingRequest.test_request_loaded_into_view__headers.svg
diff --git a/...__/test_snapshots/TestLoadingRequest.test_request_loaded_into_view__options.svg b/...__/test_snapshots/TestLoadingRequest.test_request_loaded_into_view__options.svg
diff --git a/...st_snapshots/TestLoadingRequest.test_request_loaded_into_view__query_params.svg b/...st_snapshots/TestLoadingRequest.test_request_loaded_into_view__query_params.svg
diff --git a/tests/__snapshots__/test_snapshots/TestMethodSelection.test_select_post_method.svg b/tests/__snapshots__/test_snapshots/TestMethodSelection.test_select_post_method.svg
diff --git a/...snapshots__/test_snapshots/TestNewRequest.test_dialog_loads_and_can_be_used.svg b/...snapshots__/test_snapshots/TestNewRequest.test_dialog_loads_and_can_be_used.svg
diff --git a/...tNewRequest.test_new_request_added_to_tree_correctly_and_notification_shown.svg b/...tNewRequest.test_new_request_added_to_tree_correctly_and_notification_shown.svg
diff --git a/..._snapshots/TestSave.test_no_request_selected__dialog_is_prefilled_correctly.svg b/..._snapshots/TestSave.test_no_request_selected__dialog_is_prefilled_correctly.svg
diff --git a/tests/__snapshots__/test_snapshots/TestSendRequest.test_send_request.svg b/tests/__snapshots__/test_snapshots/TestSendRequest.test_send_request.svg
diff --git a/tests/__snapshots__/test_snapshots/TestUrlBar.test_dropdown_appears_on_typing.svg b/tests/__snapshots__/test_snapshots/TestUrlBar.test_dropdown_appears_on_typing.svg
diff --git a/..._/test_snapshots/TestUrlBar.test_dropdown_completion_selected_via_enter_key.svg b/..._/test_snapshots/TestUrlBar.test_dropdown_completion_selected_via_enter_key.svg
diff --git a/...s__/test_snapshots/TestUrlBar.test_dropdown_completion_selected_via_tab_key.svg b/...s__/test_snapshots/TestUrlBar.test_dropdown_completion_selected_via_tab_key.svg
diff --git a/tests/__snapshots__/test_snapshots/TestUrlBar.test_dropdown_filters_on_typing.svg b/tests/__snapshots__/test_snapshots/TestUrlBar.test_dropdown_filters_on_typing.svg
diff --git a/tests/__snapshots__/test_snapshots/TestUrlBar.test_enter_url.svg b/tests/__snapshots__/test_snapshots/TestUrlBar.test_enter_url.svg
diff --git a/...ots__/test_snapshots/TestUserInterfaceShortcuts.test_expand_request_section.svg b/...ots__/test_snapshots/TestUserInterfaceShortcuts.test_expand_request_section.svg
diff --git a/...napshots__/test_snapshots/TestUserInterfaceShortcuts.test_expand_then_reset.svg b/...napshots__/test_snapshots/TestUserInterfaceShortcuts.test_expand_then_reset.svg
diff --git a/...pshots__/test_snapshots/TestVariables.test_unresolved_variables_highlighted.svg b/...pshots__/test_snapshots/TestVariables.test_unresolved_variables_highlighted.svg
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -10,7 +10,7 @@
 from os import PathLike
 from pathlib import Path, PurePath
 from tempfile import mkdtemp
-from typing import Awaitable, Union, Optional, Callable, Iterable, TYPE_CHECKING
+from typing import Any, Awaitable, Union, Optional, Callable, Iterable, TYPE_CHECKING
 
 import pytest
 from _pytest.config import ExitCode
@@ -21,10 +21,10 @@
 from rich.console import Console
 from syrupy import SnapshotAssertion
 from syrupy.extensions.single_file import SingleFileSnapshotExtension, WriteMode
+from textual.app import App
 
 if TYPE_CHECKING:
     from _pytest.nodes import Item
-    from textual.app import App
     from textual.pilot import Pilot
 
 
@@ -124,7 +124,7 @@ def snap_compare(
     snapshot = snapshot.use_extension(SVGImageExtension)
 
     def compare(
-        app_path: str | PurePath,
+        app_path: str | PurePath | App[Any],
         press: Iterable[str] = (),
         terminal_size: tuple[int, int] = (80, 24),
         run_before: Callable[[Pilot], Awaitable[None] | None] | None = None,
@@ -150,16 +150,20 @@ def compare(
         from textual._import_app import import_app
 
         node = request.node
-        path = Path(app_path)
-        if path.is_absolute():
-            # If the user supplies an absolute path, just use it directly.
-            app = import_app(str(path.resolve()))
+
+        if isinstance(app_path, App):
+            app = app_path
         else:
-            # If a relative path is supplied by the user, it's relative to the location of the pytest node,
-            # NOT the location that `pytest` was invoked from.
-            node_path = node.path.parent
-            resolved = (node_path / app_path).resolve()
-            app = import_app(str(resolved))
+            path = Path(app_path)
+            if path.is_absolute():
+                # If the user supplies an absolute path, just use it directly.
+                app = import_app(str(path.resolve()))
+            else:
+                # If a relative path is supplied by the user, it's relative to the location of the pytest node,
+                # NOT the location that `pytest` was invoked from.
+                node_path = node.path.parent
+                resolved = (node_path / app_path).resolve()
+                app = import_app(str(resolved))
 
         from textual._doc import take_svg_screenshot
 

diff --git a/tests/test_snapshots.py b/tests/test_snapshots.py
@@ -251,7 +251,7 @@ def test_request_loaded_into_view__headers(self, snap_compare):
 
         async def run_before(pilot: Pilot):
             # Navigate to 'get one post' and select it.
-            await pilot.press("J", "J", "j")
+            await pilot.press(*"Jj")
             await pilot.press("enter")
 
         assert snap_compare(POSTING_MAIN, run_before=run_before, terminal_size=(80, 34))
@@ -261,7 +261,7 @@ def test_request_loaded_into_view__body(self, snap_compare):
 
         async def run_before(pilot: Pilot):
             # Navigate to 'POST one post' and select it.
-            await pilot.press("J", "J", "j", "j")
+            await pilot.press(*"JJjjj")
             await pilot.press("enter")
             await pilot.press("ctrl+o", "w")  # jump to 'Body' tab
 
@@ -272,7 +272,7 @@ def test_request_loaded_into_view__query_params(self, snap_compare):
 
         async def run_before(pilot: Pilot):
             # Navigate to 'GET comments via query' and select it.
-            await pilot.press("J", "J", "J", "j", "j")
+            await pilot.press(*"JJJjj")
             await pilot.press("enter")
             await pilot.press("ctrl+o", "e")  # jump to 'Query Params' tab
 
@@ -283,7 +283,7 @@ def test_request_loaded_into_view__auth(self, snap_compare):
 
         async def run_before(pilot: Pilot):
             # Navigate to 'GET comments via query' and select it.
-            await pilot.press("j")
+            await pilot.press(*"jj")
             await pilot.press("enter")
             await pilot.press("ctrl+o", "r")  # jump to 'Auth' tab
 
@@ -306,7 +306,7 @@ def test_request_loaded_into_view__options(self, snap_compare):
         """Check that the request options are loaded into the view."""
 
         async def run_before(pilot: Pilot):
-            await pilot.press("j")
+            await pilot.press(*"jj")
             await pilot.press("enter")
             await pilot.press("ctrl+o", "y")  # jump to 'Options' tab