remote/datasette
1
0
Fork 0
mirror of https://github.com/simonw/datasette.git synced 2026-06-22 00:34:35 +02:00
Code Issues Projects Releases Packages Wiki Activity

Renamed base_url parameter to ds_base_url in tests

Browse source 
Integrating Playwright brought in pytest-base-url which declares a
base_url fixture that was colliding with our own base_url parameters.
This commit is contained in:
Simon Willison 2026-06-16 14:25:42 -07:00
commit 8c700f5337
1 changed files with 24 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

48
tests/test_internals_urls.py
View file

@ -9,7 +9,7 @@ def ds():
@pytest.mark.parametrize(
"base_url,path,expected",
"ds_base_url,path,expected",
[
("/", "/", "/"),
("/", "/foo", "/foo"),
@ -20,8 +20,8 @@ def ds():
("/data/", "/data/foo", "/data/data/foo"),
],
)
def test_path(ds, base_url, path, expected):
ds._settings["base_url"] = base_url
def test_path(ds, ds_base_url, path, expected):
ds._settings["base_url"] = ds_base_url
actual = ds.urls.path(path)
assert actual == expected
assert isinstance(actual, PrefixedUrlString)
@ -36,35 +36,35 @@ def test_path_applied_twice_does_not_double_prefix(ds):
@pytest.mark.parametrize(
"base_url,expected",
"ds_base_url,expected",
[
("/", "/"),
("/prefix/", "/prefix/"),
],
)
def test_instance(ds, base_url, expected):
ds._settings["base_url"] = base_url
def test_instance(ds, ds_base_url, expected):
ds._settings["base_url"] = ds_base_url
actual = ds.urls.instance()
assert actual == expected
assert isinstance(actual, PrefixedUrlString)
@pytest.mark.parametrize(
"base_url,file,expected",
"ds_base_url,file,expected",
[
("/", "foo.js", "/-/static/foo.js"),
("/prefix/", "foo.js", "/prefix/-/static/foo.js"),
],
)
def test_static(ds, base_url, file, expected):
ds._settings["base_url"] = base_url
def test_static(ds, ds_base_url, file, expected):
ds._settings["base_url"] = ds_base_url
actual = ds.urls.static(file)
assert actual == expected
assert isinstance(actual, PrefixedUrlString)
@pytest.mark.parametrize(
"base_url,plugin,file,expected",
"ds_base_url,plugin,file,expected",
[
(
"/",
@ -80,44 +80,44 @@ def test_static(ds, base_url, file, expected):
),
],
)
def test_static_plugins(ds, base_url, plugin, file, expected):
ds._settings["base_url"] = base_url
def test_static_plugins(ds, ds_base_url, plugin, file, expected):
ds._settings["base_url"] = ds_base_url
actual = ds.urls.static_plugins(plugin, file)
assert actual == expected
assert isinstance(actual, PrefixedUrlString)
@pytest.mark.parametrize(
"base_url,expected",
"ds_base_url,expected",
[
("/", "/-/logout"),
("/prefix/", "/prefix/-/logout"),
],
)
def test_logout(ds, base_url, expected):
ds._settings["base_url"] = base_url
def test_logout(ds, ds_base_url, expected):
ds._settings["base_url"] = ds_base_url
actual = ds.urls.logout()
assert actual == expected
assert isinstance(actual, PrefixedUrlString)
@pytest.mark.parametrize(
"base_url,format,expected",
"ds_base_url,format,expected",
[
("/", None, "/_memory"),
("/prefix/", None, "/prefix/_memory"),
("/", "json", "/_memory.json"),
],
)
def test_database(ds, base_url, format, expected):
ds._settings["base_url"] = base_url
def test_database(ds, ds_base_url, format, expected):
ds._settings["base_url"] = ds_base_url
actual = ds.urls.database("_memory", format=format)
assert actual == expected
assert isinstance(actual, PrefixedUrlString)
@pytest.mark.parametrize(
"base_url,name,format,expected",
"ds_base_url,name,format,expected",
[
("/", "name", None, "/_memory/name"),
("/prefix/", "name", None, "/prefix/_memory/name"),
@ -125,8 +125,8 @@ def test_database(ds, base_url, format, expected):
("/", "name.json", "json", "/_memory/name~2Ejson.json"),
],
)
def test_table_and_query(ds, base_url, name, format, expected):
ds._settings["base_url"] = base_url
def test_table_and_query(ds, ds_base_url, name, format, expected):
ds._settings["base_url"] = ds_base_url
actual1 = ds.urls.table("_memory", name, format=format)
assert actual1 == expected
assert isinstance(actual1, PrefixedUrlString)
@ -136,15 +136,15 @@ def test_table_and_query(ds, base_url, name, format, expected):
@pytest.mark.parametrize(
"base_url,format,expected",
"ds_base_url,format,expected",
[
("/", 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
def test_row(ds, ds_base_url, format, expected):
ds._settings["base_url"] = ds_base_url
actual = ds.urls.row("_memory", "facetable", "1", format=format)
assert actual == expected
assert isinstance(actual, PrefixedUrlString)