Logout link in nav, refs #875

tests/test_auth.py

@@ -78,3 +78,17 @@ def test_logout(app_client):
     # Should also have set a message
     messages = app_client.ds.unsign(response4.cookies["ds_messages"], "messages")
     assert [["You are now logged out", 2]] == messages
+
+
+@pytest.mark.parametrize("path", ["/", "/fixtures", "/fixtures/facetable"])
+def test_logout_button_in_navigation(app_client, path):
+    response = app_client.get(
+        path, cookies={"ds_actor": app_client.actor_cookie({"id": "test"})}
+    )
+    anon_response = app_client.get(path)
+    for fragment in (
+        "<strong>test</strong> &middot;",
+        '<form action="/-/logout" method="post">',
+    ):
+        assert fragment in response.text
+        assert fragment not in anon_response.text

tests/test_utils.py

@@ -517,3 +517,22 @@ def test_actor_matches_allow(actor, allow, expected):
 )
 def test_resolve_env_secrets(config, expected):
     assert expected == utils.resolve_env_secrets(config, {"FOO": "x"})
+
+
+@pytest.mark.parametrize(
+    "actor,expected",
+    [
+        ({"id": "blah"}, "blah"),
+        ({"id": "blah", "login": "l"}, "l"),
+        ({"id": "blah", "login": "l"}, "l"),
+        ({"id": "blah", "login": "l", "username": "u"}, "u"),
+        ({"login": "l", "name": "n"}, "n"),
+        (
+            {"id": "blah", "login": "l", "username": "u", "name": "n", "display": "d"},
+            "d",
+        ),
+        ({"weird": "shape"}, "{'weird': 'shape'}"),
+    ],
+)
+def test_display_actor(actor, expected):
+    assert expected == utils.display_actor(actor)