github/datasette
1
0
Fork 0
mirror of https://github.com/simonw/datasette.git synced 2025-12-10 16:51:24 +01:00
Code Issues Projects Releases Packages Wiki Activity

Renamed resource_identifier to resource, refs #817

Browse source
This commit is contained in:
Simon Willison 2020-06-08 11:59:11 -07:00
commit 799c5d5357
12 changed files with 40 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tests/conftest.py
View file

@ -70,8 +70,8 @@ def check_permission_actions_are_documented():
action = kwargs.get("action").replace("-", "_")
assert (
action in documented_permission_actions
), "Undocumented permission action: {}, resource_identifier: {}".format(
action, kwargs["resource_identifier"]
), "Undocumented permission action: {}, resource: {}".format(
action, kwargs["resource"]
)
pm.add_hookcall_monitoring(

15
tests/fixtures.py
View file

@ -857,21 +857,18 @@ if __name__ == "__main__":
def assert_permissions_checked(datasette, actions):
# actions is a list of "action" or (action, resource_identifier) tuples
# actions is a list of "action" or (action, resource) tuples
for action in actions:
if isinstance(action, str):
resource_identifier = None
resource = None
else:
action, resource_identifier = action
action, resource = action
assert [
pc
for pc in datasette._permission_checks
if pc["action"] == action
and pc["resource_identifier"] == resource_identifier
], """Missing expected permission check: action={}, resource_identifier={}
if pc["action"] == action and pc["resource"] == resource
], """Missing expected permission check: action={}, resource={}
Permission checks seen: {}
""".format(
action,
resource_identifier,
json.dumps(list(datasette._permission_checks), indent=4),
action, resource, json.dumps(list(datasette._permission_checks), indent=4),
)