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 /:memory: to /_memory, with redirects - closes #1205

Browse source
This commit is contained in:
Simon Willison 2021-01-28 14:48:56 -08:00
commit 1600d2a3ec
10 changed files with 65 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

26
tests/test_api.py
View file

@ -608,11 +608,11 @@ def test_no_files_uses_memory_database(app_client_no_files):
response = app_client_no_files.get("/.json")
assert response.status == 200
assert {
":memory:": {
"name": ":memory:",
"_memory": {
"name": "_memory",
"hash": None,
"color": "f7935d",
"path": "/%3Amemory%3A",
"color": "a6c7b9",
"path": "/_memory",
"tables_and_views_truncated": [],
"tables_and_views_more": False,
"tables_count": 0,
@ -626,12 +626,28 @@ def test_no_files_uses_memory_database(app_client_no_files):
} == response.json
# Try that SQL query
response = app_client_no_files.get(
"/:memory:.json?sql=select+sqlite_version()&_shape=array"
"/_memory.json?sql=select+sqlite_version()&_shape=array"
)
assert 1 == len(response.json)
assert ["sqlite_version()"] == list(response.json[0].keys())
@pytest.mark.parametrize(
"path,expected_redirect",
(
("/:memory:", "/_memory"),
("/:memory:.json", "/_memory.json"),
("/:memory:?sql=select+1", "/_memory?sql=select+1"),
("/:memory:.json?sql=select+1", "/_memory.json?sql=select+1"),
("/:memory:.csv?sql=select+1", "/_memory.csv?sql=select+1"),
),
)
def test_old_memory_urls_redirect(app_client_no_files, path, expected_redirect):
response = app_client_no_files.get(path, allow_redirects=False)
assert response.status == 301
assert response.headers["location"] == expected_redirect
def test_database_page_for_database_with_dot_in_name(app_client_with_dot):
response = app_client_with_dot.get("/fixtures.dot.json")
assert 200 == response.status

2
tests/test_cli.py
View file

@ -221,7 +221,7 @@ def test_config_deprecated(ensure_eventloop):
def test_sql_errors_logged_to_stderr(ensure_eventloop):
runner = CliRunner(mix_stderr=False)
result = runner.invoke(cli, ["--get", "/:memory:.json?sql=select+blah"])
result = runner.invoke(cli, ["--get", "/_memory.json?sql=select+blah"])
assert result.exit_code == 1
assert "sql = 'select blah', params = {}: no such column: blah\n" in result.stderr

4
tests/test_cli_serve_get.py
View file

@ -30,12 +30,12 @@ def test_serve_with_get(tmp_path_factory):
"--plugins-dir",
str(plugins_dir),
"--get",
"/:memory:.json?sql=select+sqlite_version()",
"/_memory.json?sql=select+sqlite_version()",
],
)
assert 0 == result.exit_code, result.output
assert {
"database": ":memory:",
"database": "_memory",
"truncated": False,
"columns": ["sqlite_version()"],
}.items() <= json.loads(result.output).items()

6
tests/test_html.py
View file

@ -88,7 +88,7 @@ def test_static_mounts():
def test_memory_database_page():
with make_app_client(memory=True) as client:
response = client.get("/:memory:")
response = client.get("/_memory")
assert response.status == 200
@ -1056,10 +1056,10 @@ def test_database_download_disallowed_for_mutable(app_client):
def test_database_download_disallowed_for_memory():
with make_app_client(memory=True) as client:
# Memory page should NOT have a download link
response = client.get("/:memory:")
response = client.get("/_memory")
soup = Soup(response.body, "html.parser")
assert 0 == len(soup.findAll("a", {"href": re.compile(r"\.db$")}))
assert 404 == client.get("/:memory:.db").status
assert 404 == client.get("/_memory.db").status
def test_allow_download_off():

28
tests/test_internals_urls.py
View file

@ -103,14 +103,14 @@ def test_logout(ds, base_url, expected):
@pytest.mark.parametrize(
"base_url,format,expected",
[
("/", None, "/%3Amemory%3A"),
("/prefix/", None, "/prefix/%3Amemory%3A"),
("/", "json", "/%3Amemory%3A.json"),
("/", None, "/_memory"),
("/prefix/", None, "/prefix/_memory"),
("/", "json", "/_memory.json"),
],
)
def test_database(ds, base_url, format, expected):
ds._settings["base_url"] = base_url
actual = ds.urls.database(":memory:", format=format)
actual = ds.urls.database("_memory", format=format)
assert actual == expected
assert isinstance(actual, PrefixedUrlString)
@ -118,18 +118,18 @@ def test_database(ds, base_url, format, expected):
@pytest.mark.parametrize(
"base_url,name,format,expected",
[
("/", "name", None, "/%3Amemory%3A/name"),
("/prefix/", "name", None, "/prefix/%3Amemory%3A/name"),
("/", "name", "json", "/%3Amemory%3A/name.json"),
("/", "name.json", "json", "/%3Amemory%3A/name.json?_format=json"),
("/", "name", None, "/_memory/name"),
("/prefix/", "name", None, "/prefix/_memory/name"),
("/", "name", "json", "/_memory/name.json"),
("/", "name.json", "json", "/_memory/name.json?_format=json"),
],
)
def test_table_and_query(ds, base_url, name, format, expected):
ds._settings["base_url"] = base_url
actual1 = ds.urls.table(":memory:", name, format=format)
actual1 = ds.urls.table("_memory", name, format=format)
assert actual1 == expected
assert isinstance(actual1, PrefixedUrlString)
actual2 = ds.urls.query(":memory:", name, format=format)
actual2 = ds.urls.query("_memory", name, format=format)
assert actual2 == expected
assert isinstance(actual2, PrefixedUrlString)
@ -137,14 +137,14 @@ def test_table_and_query(ds, base_url, name, format, expected):
@pytest.mark.parametrize(
"base_url,format,expected",
[
("/", None, "/%3Amemory%3A/facetable/1"),
("/prefix/", None, "/prefix/%3Amemory%3A/facetable/1"),
("/", "json", "/%3Amemory%3A/facetable/1.json"),
("/", None, "/_memory/facetable/1"),
("/prefix/", None, "/prefix/_memory/facetable/1"),
("/", "json", "/_memory/facetable/1.json"),
],
)
def test_row(ds, base_url, format, expected):
ds._settings["base_url"] = base_url
actual = ds.urls.row(":memory:", "facetable", "1", format=format)
actual = ds.urls.row("_memory", "facetable", "1", format=format)
assert actual == expected
assert isinstance(actual, PrefixedUrlString)