Route names must match pgwui component names

diff --git a/src/pgwui_common/__init__.py b/src/pgwui_common/__init__.py
index 642e773ba36aa30376d0adab10e163f574394770..04d768d879097900f9c6ef16b36b47d70bc9a2a2 100644 (file)
--- 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 4759e6ba04fe2cb0e8d0fe5c2e2607ad28235f39..fcf1c17bfc43160f404814a945fa3cb9e9b48f9d 100644 (file)
--- 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):