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

Emergency fix for broken links in 0.50, closes #1010

Browse source
This commit is contained in:
Simon Willison 2020-10-09 17:33:13 -07:00
commit c13d184704
3 changed files with 30 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

41
tests/test_html.py
View file

@ -635,24 +635,24 @@ def test_table_csv_json_export_interface(app_client):
.find("p", {"class": "export-links"})
.findAll("a")
)
actual = [l["href"].split("/")[-1] for l in links]
actual = [l["href"] for l in links]
expected = [
"simple_primary_key.json?id__gt=2",
"simple_primary_key.testall?id__gt=2",
"simple_primary_key.testnone?id__gt=2",
"simple_primary_key.testresponse?id__gt=2",
"simple_primary_key.csv?id__gt=2&_size=max",
"/fixtures/simple_primary_key.json?id__gt=2",
"/fixtures/simple_primary_key.testall?id__gt=2",
"/fixtures/simple_primary_key.testnone?id__gt=2",
"/fixtures/simple_primary_key.testresponse?id__gt=2",
"/fixtures/simple_primary_key.csv?id__gt=2&_size=max",
"#export",
]
assert expected == actual
# And the advaced export box at the bottom:
div = Soup(response.body, "html.parser").find("div", {"class": "advanced-export"})
json_links = [a["href"].split("/")[-1] for a in div.find("p").findAll("a")]
json_links = [a["href"] for a in div.find("p").findAll("a")]
assert [
"simple_primary_key.json?id__gt=2",
"simple_primary_key.json?id__gt=2&_shape=array",
"simple_primary_key.json?id__gt=2&_shape=array&_nl=on",
"simple_primary_key.json?id__gt=2&_shape=object",
"/fixtures/simple_primary_key.json?id__gt=2",
"/fixtures/simple_primary_key.json?id__gt=2&_shape=array",
"/fixtures/simple_primary_key.json?id__gt=2&_shape=array&_nl=on",
"/fixtures/simple_primary_key.json?id__gt=2&_shape=object",
] == json_links
# And the CSV form
form = div.find("form")
@ -666,6 +666,12 @@ def test_table_csv_json_export_interface(app_client):
] == inputs
def test_row_json_export_link(app_client):
response = app_client.get("/fixtures/simple_primary_key/1")
assert response.status == 200
assert '<a href="/fixtures/simple_primary_key/1.json">json</a>' in response.text
def test_csv_json_export_links_include_labels_if_foreign_keys(app_client):
response = app_client.get("/fixtures/facetable")
assert response.status == 200
@ -674,13 +680,13 @@ def test_csv_json_export_links_include_labels_if_foreign_keys(app_client):
.find("p", {"class": "export-links"})
.findAll("a")
)
actual = [l["href"].split("/")[-1] for l in links]
actual = [l["href"] for l in links]
expected = [
"facetable.json?_labels=on",
"facetable.testall?_labels=on",
"facetable.testnone?_labels=on",
"facetable.testresponse?_labels=on",
"facetable.csv?_labels=on&_size=max",
"/fixtures/facetable.json?_labels=on",
"/fixtures/facetable.testall?_labels=on",
"/fixtures/facetable.testnone?_labels=on",
"/fixtures/facetable.testresponse?_labels=on",
"/fixtures/facetable.csv?_labels=on&_size=max",
"#export",
]
assert expected == actual
@ -1347,6 +1353,7 @@ def test_metadata_sort_desc(app_client):
assert list(reversed(expected)) == rows
@pytest.mark.xfail
@pytest.mark.parametrize("base_url", ["/prefix/", "https://example.com/"])
@pytest.mark.parametrize(
"path",