check_visibility can now take multiple permissions into account

Closes #1829

tests/test_internals_datasette.py

@@ -1,6 +1,7 @@
 """
 Tests for the datasette.app.Datasette class
 """
+from datasette import Forbidden
 from datasette.app import Datasette, Database
 from itsdangerous import BadSignature
 from .fixtures import app_client
@@ -75,3 +76,52 @@ async def test_num_sql_threads_zero():
     assert response.json() == {"num_threads": 0, "threads": []}
     response2 = await ds.client.get("/test_num_sql_threads_zero/t.json?_shape=array")
     assert response2.json() == [{"id": 1}]
+
+
+ROOT = {"id": "root"}
+ALLOW_ROOT = {"allow": {"id": "root"}}
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize(
+    "actor,metadata,permissions,should_allow,expected_private",
+    (
+        (None, ALLOW_ROOT, ["view-instance"], False, False),
+        (ROOT, ALLOW_ROOT, ["view-instance"], True, True),
+        (
+            None,
+            {"databases": {"_memory": ALLOW_ROOT}},
+            [("view-database", "_memory")],
+            False,
+            False,
+        ),
+        (
+            ROOT,
+            {"databases": {"_memory": ALLOW_ROOT}},
+            [("view-database", "_memory")],
+            True,
+            True,
+        ),
+        # Check private is false for non-protected instance check
+        (
+            ROOT,
+            {"allow": True},
+            ["view-instance"],
+            True,
+            False,
+        ),
+    ),
+)
+async def test_datasette_ensure_permissions_check_visibility(
+    actor, metadata, permissions, should_allow, expected_private
+):
+    ds = Datasette([], memory=True, metadata=metadata)
+    if not should_allow:
+        with pytest.raises(Forbidden):
+            await ds.ensure_permissions(actor, permissions)
+    else:
+        await ds.ensure_permissions(actor, permissions)
+    # And try check_visibility too:
+    visible, private = await ds.check_visibility(actor, permissions=permissions)
+    assert visible == should_allow
+    assert private == expected_private