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

default_cache_ttl_hashed config and ?_hash= param

Browse source
This commit is contained in:
Simon Willison 2019-03-17 15:41:34 -07:00
commit 8f003d9545
7 changed files with 72 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

20
tests/test_api.py
View file

@ -1050,7 +1050,8 @@ def test_config_json(app_client):
"allow_facet": True,
"suggest_facets": True,
"allow_sql": True,
"default_cache_ttl": 365 * 24 * 60 * 60,
"default_cache_ttl": 5,
"default_cache_ttl_hashed": 365 * 24 * 60 * 60,
"num_sql_threads": 3,
"cache_size_kb": 0,
"allow_csv_stream": True,
@ -1302,8 +1303,8 @@ def test_expand_label(app_client):
@pytest.mark.parametrize('path,expected_cache_control', [
("/fixtures/facetable.json", "max-age=31536000"),
("/fixtures/facetable.json?_ttl=invalid", "max-age=31536000"),
("/fixtures/facetable.json", "max-age=5"),
("/fixtures/facetable.json?_ttl=invalid", "max-age=5"),
("/fixtures/facetable.json?_ttl=10", "max-age=10"),
("/fixtures/facetable.json?_ttl=0", "no-cache"),
])
@ -1312,6 +1313,19 @@ def test_ttl_parameter(app_client, path, expected_cache_control):
assert expected_cache_control == response.headers['Cache-Control']
@pytest.mark.parametrize("path,expected_redirect", [
("/fixtures/facetable.json?_hash=1", "/fixtures-HASH/facetable.json"),
("/fixtures/facetable.json?city_id=1&_hash=1", "/fixtures-HASH/facetable.json?city_id=1"),
])
def test_hash_parameter(app_client, path, expected_redirect):
# First get the current hash for the fixtures database
current_hash = app_client.get("/-/inspect.json").json["fixtures"]["hash"][:7]
response = app_client.get(path, allow_redirects=False)
assert response.status == 302
location = response.headers["Location"]
assert expected_redirect.replace("HASH", current_hash) == location
test_json_columns_default_expected = [{
"intval": 1,
"strval": "s",

7
tests/test_utils.py
View file

@ -59,6 +59,13 @@ def test_path_with_removed_args(path, args, expected):
)
actual = utils.path_with_removed_args(request, args)
assert expected == actual
# Run the test again but this time use the path= argument
request = Request(
"/".encode('utf8'),
{}, '1.1', 'GET', None
)
actual = utils.path_with_removed_args(request, args, path=path)
assert expected == actual
@pytest.mark.parametrize('path,args,expected', [