Refactor _headers() for write API tests

This commit is contained in:
Simon Willison 2022-12-07 17:39:07 -08:00
commit 34cffff02a

View file

@ -28,16 +28,20 @@ def write_token(ds, actor_id="root", permissions=None):
return "dstok_{}".format(ds.sign(to_sign, namespace="token")) return "dstok_{}".format(ds.sign(to_sign, namespace="token"))
def _headers(token):
return {
"Authorization": "Bearer {}".format(token),
"Content-Type": "application/json",
}
@pytest.mark.asyncio @pytest.mark.asyncio
async def test_insert_row(ds_write): async def test_insert_row(ds_write):
token = write_token(ds_write) token = write_token(ds_write)
response = await ds_write.client.post( response = await ds_write.client.post(
"/data/docs/-/insert", "/data/docs/-/insert",
json={"row": {"title": "Test", "score": 1.2, "age": 5}}, json={"row": {"title": "Test", "score": 1.2, "age": 5}},
headers={ headers=_headers(token),
"Authorization": "Bearer {}".format(token),
"Content-Type": "application/json",
},
) )
expected_row = {"id": 1, "title": "Test", "score": 1.2, "age": 5} expected_row = {"id": 1, "title": "Test", "score": 1.2, "age": 5}
assert response.status_code == 201 assert response.status_code == 201
@ -61,10 +65,7 @@ async def test_insert_rows(ds_write, return_rows):
response = await ds_write.client.post( response = await ds_write.client.post(
"/data/docs/-/insert", "/data/docs/-/insert",
json=data, json=data,
headers={ headers=_headers(token),
"Authorization": "Bearer {}".format(token),
"Content-Type": "application/json",
},
) )
assert response.status_code == 201 assert response.status_code == 201
actual_rows = [ actual_rows = [
@ -347,10 +348,7 @@ async def test_insert_ignore_replace(
response = await ds_write.client.post( response = await ds_write.client.post(
"/data/docs/-/insert", "/data/docs/-/insert",
json=data, json=data,
headers={ headers=_headers(token),
"Authorization": "Bearer {}".format(token),
"Content-Type": "application/json",
},
) )
assert response.status_code == 201 assert response.status_code == 201
actual_rows = [ actual_rows = [
@ -415,10 +413,7 @@ async def test_upsert(ds_write, initial, input, expected_rows, should_return):
create_response = await ds_write.client.post( create_response = await ds_write.client.post(
"/data/-/create", "/data/-/create",
json=initial, json=initial,
headers={ headers=_headers(token),
"Authorization": "Bearer {}".format(token),
"Content-Type": "application/json",
},
) )
assert create_response.status_code == 201 assert create_response.status_code == 201
if should_return: if should_return:
@ -426,10 +421,7 @@ async def test_upsert(ds_write, initial, input, expected_rows, should_return):
response = await ds_write.client.post( response = await ds_write.client.post(
"/data/upsert_test/-/upsert", "/data/upsert_test/-/upsert",
json=input, json=input,
headers={ headers=_headers(token),
"Authorization": "Bearer {}".format(token),
"Content-Type": "application/json",
},
) )
assert response.status_code == 200 assert response.status_code == 200
assert response.json()["ok"] is True assert response.json()["ok"] is True
@ -450,10 +442,7 @@ async def _insert_row(ds):
insert_response = await ds.client.post( insert_response = await ds.client.post(
"/data/docs/-/insert", "/data/docs/-/insert",
json={"row": {"title": "Row one", "score": 1.2, "age": 5}, "return": True}, json={"row": {"title": "Row one", "score": 1.2, "age": 5}, "return": True},
headers={ headers=_headers(write_token(ds)),
"Authorization": "Bearer {}".format(write_token(ds)),
"Content-Type": "application/json",
},
) )
assert insert_response.status_code == 201 assert insert_response.status_code == 201
return insert_response.json()["rows"][0]["id"] return insert_response.json()["rows"][0]["id"]
@ -476,10 +465,7 @@ async def test_delete_row_errors(ds_write, scenario):
) )
response = await ds_write.client.post( response = await ds_write.client.post(
path, path,
headers={ headers=_headers(token),
"Authorization": "Bearer {}".format(token),
"Content-Type": "application/json",
},
) )
assert response.status_code == 403 if scenario in ("no_token", "bad_token") else 404 assert response.status_code == 403 if scenario in ("no_token", "bad_token") else 404
assert response.json()["ok"] is False assert response.json()["ok"] is False
@ -519,9 +505,7 @@ async def test_delete_row(ds_write, table, row_for_create, pks, delete_path):
create_response = await ds_write.client.post( create_response = await ds_write.client.post(
"/data/-/create", "/data/-/create",
json=create_data, json=create_data,
headers={ headers=_headers(write_token(ds_write)),
"Authorization": "Bearer {}".format(write_token(ds_write)),
},
) )
assert create_response.status_code == 201, create_response.json() assert create_response.status_code == 201, create_response.json()
# Should be a single row # Should be a single row
@ -541,9 +525,7 @@ async def test_delete_row(ds_write, table, row_for_create, pks, delete_path):
delete_response = await ds_write.client.post( delete_response = await ds_write.client.post(
"/data/{}/{}/-/delete".format(table, delete_path), "/data/{}/{}/-/delete".format(table, delete_path),
headers={ headers=_headers(write_token(ds_write)),
"Authorization": "Bearer {}".format(write_token(ds_write)),
},
) )
assert delete_response.status_code == 200 assert delete_response.status_code == 200
assert ( assert (
@ -572,10 +554,7 @@ async def test_update_row_check_permission(ds_write, scenario):
response = await ds_write.client.post( response = await ds_write.client.post(
path, path,
json={"update": {"title": "New title"}}, json={"update": {"title": "New title"}},
headers={ headers=_headers(token),
"Authorization": "Bearer {}".format(token),
"Content-Type": "application/json",
},
) )
assert response.status_code == 403 if scenario in ("no_token", "bad_token") else 404 assert response.status_code == 403 if scenario in ("no_token", "bad_token") else 404
assert response.json()["ok"] is False assert response.json()["ok"] is False
@ -612,10 +591,7 @@ async def test_update_row(ds_write, input, expected_errors, use_return):
response = await ds_write.client.post( response = await ds_write.client.post(
path, path,
json=data, json=data,
headers={ headers=_headers(token),
"Authorization": "Bearer {}".format(token),
"Content-Type": "application/json",
},
) )
if expected_errors: if expected_errors:
assert response.status_code == 400 assert response.status_code == 400
@ -664,10 +640,7 @@ async def test_drop_table(ds_write, scenario):
) )
response = await ds_write.client.post( response = await ds_write.client.post(
path, path,
headers={ headers=_headers(token),
"Authorization": "Bearer {}".format(token),
"Content-Type": "application/json",
},
) )
if not should_work: if not should_work:
assert ( assert (
@ -698,10 +671,7 @@ async def test_drop_table(ds_write, scenario):
response2 = await ds_write.client.post( response2 = await ds_write.client.post(
path, path,
json={"confirm": True}, json={"confirm": True},
headers={ headers=_headers(token),
"Authorization": "Bearer {}".format(token),
"Content-Type": "application/json",
},
) )
assert response2.json() == {"ok": True} assert response2.json() == {"ok": True}
assert (await ds_write.client.get("/data/docs")).status_code == 404 assert (await ds_write.client.get("/data/docs")).status_code == 404
@ -1119,10 +1089,7 @@ async def test_create_table(ds_write, input, expected_status, expected_response)
response = await ds_write.client.post( response = await ds_write.client.post(
"/data/-/create", "/data/-/create",
json=input, json=input,
headers={ headers=_headers(token),
"Authorization": "Bearer {}".format(token),
"Content-Type": "application/json",
},
) )
assert response.status_code == expected_status assert response.status_code == expected_status
data = response.json() data = response.json()
@ -1177,10 +1144,7 @@ async def test_create_table_ignore_replace(ds_write, input, expected_rows_after)
"table": "test_insert_replace", "table": "test_insert_replace",
"pk": "id", "pk": "id",
}, },
headers={ headers=_headers(token),
"Authorization": "Bearer {}".format(token),
"Content-Type": "application/json",
},
) )
assert first_response.status_code == 201 assert first_response.status_code == 201
@ -1188,10 +1152,7 @@ async def test_create_table_ignore_replace(ds_write, input, expected_rows_after)
second_response = await ds_write.client.post( second_response = await ds_write.client.post(
"/data/-/create", "/data/-/create",
json=input, json=input,
headers={ headers=_headers(token),
"Authorization": "Bearer {}".format(token),
"Content-Type": "application/json",
},
) )
assert second_response.status_code == 201 assert second_response.status_code == 201
# Check that the rows are as expected # Check that the rows are as expected
@ -1209,10 +1170,7 @@ async def test_create_table_error_if_pk_changed(ds_write):
"table": "test_insert_replace", "table": "test_insert_replace",
"pk": "id", "pk": "id",
}, },
headers={ headers=_headers(token),
"Authorization": "Bearer {}".format(token),
"Content-Type": "application/json",
},
) )
assert first_response.status_code == 201 assert first_response.status_code == 201
# Try a second time with a different pk # Try a second time with a different pk
@ -1224,10 +1182,7 @@ async def test_create_table_error_if_pk_changed(ds_write):
"pk": "name", "pk": "name",
"replace": True, "replace": True,
}, },
headers={ headers=_headers(token),
"Authorization": "Bearer {}".format(token),
"Content-Type": "application/json",
},
) )
assert second_response.status_code == 400 assert second_response.status_code == 400
assert second_response.json() == { assert second_response.json() == {
@ -1248,19 +1203,13 @@ async def test_create_table_error_rows_twice_with_duplicates(ds_write):
first_response = await ds_write.client.post( first_response = await ds_write.client.post(
"/data/-/create", "/data/-/create",
json=input, json=input,
headers={ headers=_headers(token),
"Authorization": "Bearer {}".format(token),
"Content-Type": "application/json",
},
) )
assert first_response.status_code == 201 assert first_response.status_code == 201
second_response = await ds_write.client.post( second_response = await ds_write.client.post(
"/data/-/create", "/data/-/create",
json=input, json=input,
headers={ headers=_headers(token),
"Authorization": "Bearer {}".format(token),
"Content-Type": "application/json",
},
) )
assert second_response.status_code == 400 assert second_response.status_code == 400
assert second_response.json() == { assert second_response.json() == {