From 77a0862cc7f9acf00d3e30e566f87a46ca3ab5e5 Mon Sep 17 00:00:00 2001 From: "Karl O. Pinc" Date: Sat, 27 Jun 2020 17:33:03 -0500 Subject: [PATCH] Route names must match pgwui component names --- src/pgwui_common/__init__.py | 4 ++-- tests/test___init__.py | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/pgwui_common/__init__.py b/src/pgwui_common/__init__.py index 642e773..04d768d 100644 --- a/src/pgwui_common/__init__.py +++ b/src/pgwui_common/__init__.py @@ -51,11 +51,11 @@ def auth_base_view(wrapped): response = base_view(wrapped)(request) pgwui = response['pgwui'] try: - logout_route = request.route_url('logout') + logout_route = request.route_url('pgwui_logout') except KeyError: pass # A logout route is not required else: - pgwui.setdefault('route.logout', logout_route) + pgwui.setdefault('route.pgwui_logout', logout_route) return response return wrapper diff --git a/tests/test___init__.py b/tests/test___init__.py index 4759e6b..fcf1c17 100644 --- a/tests/test___init__.py +++ b/tests/test___init__.py @@ -76,14 +76,15 @@ def test_auth_base_view_logout(pyramid_request_config): pgwui_common_init.includeme(pyramid_request_config) logout_route = '/logout' - pyramid_request_config.add_route('logout', logout_route) + pyramid_request_config.add_route('pgwui_logout', logout_route) wrapper = pgwui_common_init.auth_base_view(mock_view) request = get_current_request() response = wrapper(request) pgwui = response['pgwui'] check_base_view_results(request, pgwui) - assert pgwui['route.logout'] == request.application_url + logout_route + assert pgwui['route.pgwui_logout'] == (request.application_url + + logout_route) def test_auth_base_view_nologout(pyramid_request_config): -- 2.34.1