fix broken tests

Author: rodja

nicegui/testing/general_fixtures.py

@@ -22,31 +22,14 @@ def pytest_configure(config: pytest.Config) -> None:
 def nicegui_reset_globals() -> Generator[None, None, None]:
     """Reset the global state of the NiceGUI package."""
     for route in list(app.routes):
-        if isinstance(route, Route) and route.path.startswith('/_nicegui/auto/static/'):
-            app.remove_route(route.path)
-
-    all_page_routes = set(Client.page_routes.values())
-    all_page_routes.add('/')
-    for path in all_page_routes:
-        app.remove_route(path)
-
-    for route in list(app.routes):
-        if (
-            isinstance(route, Route) and
-            '{' in route.path and '}' in route.path and
-            not route.path.startswith('/_nicegui/')
-        ):
+        if isinstance(route, Route) and (not route.path.startswith('/_nicegui/') or route.path.startswith('/_nicegui/auto/static')):
             app.remove_route(route.path)
 
     app.openapi_schema = None
     app.middleware_stack = None
     app.user_middleware.clear()
     app.urls.clear()
     core.air = None
-    # NOTE favicon routes must be removed separately because they are not "pages"
-    for route in list(app.routes):
-        if isinstance(route, Route) and route.path.endswith('/favicon.ico'):
-            app.routes.remove(route)
     importlib.reload(core)
     importlib.reload(run)
 

tests/test_interactive_image.py

@@ -11,7 +11,7 @@
 
 
 @pytest.fixture(autouse=True)
-def provide_image_files():
+def provide_image_files(nicegui_reset_globals):
     app.add_static_file(local_file=Path(__file__).parent / 'media' / 'test1.jpg', url_path=URL_PATH1)
     app.add_static_file(local_file=Path(__file__).parent / 'media' / 'test2.jpg', url_path=URL_PATH2)
 

tests/test_sub_pages.py

@@ -526,23 +526,23 @@ def sub_content():
 
     screen.open('/foo/sub')
     screen.should_contain('sub-content')
-    assert screen.current_path == '/foo/sub'
+    assert screen.current_path.rstrip('/') == '/foo/sub'
 
     screen.click('Go to main')
     screen.should_contain('main-content')
     assert screen.current_path == '/foo'
 
     screen.click('Go to sub')
     screen.should_contain('sub-content')
-    assert screen.current_path == '/foo/sub'
+    assert screen.current_path.rstrip('/') == '/foo/sub'
 
     screen.click('Go to main')
     screen.should_contain('main-content')
     assert screen.current_path == '/foo'
 
     screen.click('Go to sub')
     screen.should_contain('sub-content')
-    assert screen.current_path == '/foo/sub'
+    assert screen.current_path.rstrip('/') == '/foo/sub'
 
 
 def test_links_pointing_to_path_which_is_not_a_sub_page(screen: Screen):