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

Fix for tests - order was inconsistent, refs #852

Browse source
This commit is contained in:
Simon Willison 2020-06-18 16:52:06 -07:00
commit b59b92b1b0
2 changed files with 17 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

20
tests/test_canned_write.py
View file

@ -108,16 +108,16 @@ def test_vary_header(canned_write_client):
def test_canned_query_permissions_on_database_page(canned_write_client): def test_canned_query_permissions_on_database_page(canned_write_client):
# Without auth only shows three queries # Without auth only shows three queries
query_names = [ query_names = {
q["name"] for q in canned_write_client.get("/data.json").json["queries"] q["name"] for q in canned_write_client.get("/data.json").json["queries"]
] }
assert [ assert {
"add_name", "add_name",
"add_name_specify_id", "add_name_specify_id",
"update_name", "update_name",
"from_async_hook", "from_async_hook",
"from_hook", "from_hook",
] == query_names } == query_names
# With auth shows four # With auth shows four
response = canned_write_client.get( response = canned_write_client.get(
@ -129,12 +129,16 @@ def test_canned_query_permissions_on_database_page(canned_write_client):
{"name": "add_name", "private": False}, {"name": "add_name", "private": False},
{"name": "add_name_specify_id", "private": False}, {"name": "add_name_specify_id", "private": False},
{"name": "delete_name", "private": True}, {"name": "delete_name", "private": True},
{"name": "update_name", "private": False},
{"name": "from_async_hook", "private": False}, {"name": "from_async_hook", "private": False},
{"name": "from_hook", "private": False}, {"name": "from_hook", "private": False},
] == [ {"name": "update_name", "private": False},
{"name": q["name"], "private": q["private"]} for q in response.json["queries"] ] == sorted(
] [
{"name": q["name"], "private": q["private"]}
for q in response.json["queries"]
],
key=lambda q: q["name"],
)
def test_canned_query_permissions(canned_write_client): def test_canned_query_permissions(canned_write_client):

8
tests/test_html.py
View file

@ -95,11 +95,13 @@ def test_database_page(app_client):
"/fixtures/%F0%9D%90%9C%F0%9D%90%A2%F0%9D%90%AD%F0%9D%90%A2%F0%9D%90%9E%F0%9D%90%AC", "/fixtures/%F0%9D%90%9C%F0%9D%90%A2%F0%9D%90%AD%F0%9D%90%A2%F0%9D%90%9E%F0%9D%90%AC",
"𝐜𝐢𝐭𝐢𝐞𝐬", "𝐜𝐢𝐭𝐢𝐞𝐬",
), ),
("/fixtures/pragma_cache_size", "pragma_cache_size"),
("/fixtures/neighborhood_search#fragment-goes-here", "Search neighborhoods"),
("/fixtures/from_async_hook", "from_async_hook"), ("/fixtures/from_async_hook", "from_async_hook"),
("/fixtures/from_hook", "from_hook"), ("/fixtures/from_hook", "from_hook"),
] == [(a["href"], a.text) for a in queries_ul.find_all("a")] ("/fixtures/neighborhood_search#fragment-goes-here", "Search neighborhoods"),
("/fixtures/pragma_cache_size", "pragma_cache_size"),
] == sorted(
[(a["href"], a.text) for a in queries_ul.find_all("a")], key=lambda p: p[0]
)
def test_invalid_custom_sql(app_client): def test_invalid_custom_sql(app_client):