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 plugin_extra_options to extra_serve_options

Browse source
This commit is contained in:
Simon Willison 2019-07-25 17:15:51 +03:00
commit f4b0bc64dc
5 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

6
tests/fixtures.py
View file

@ -108,7 +108,7 @@ def make_app_client(
inspect_data=None,
static_mounts=None,
template_dir=None,
plugin_extra_options=None,
extra_serve_options=None,
):
with tempfile.TemporaryDirectory() as tmpdir:
filepath = os.path.join(tmpdir, filename)
@ -152,7 +152,7 @@ def make_app_client(
inspect_data=inspect_data,
static_mounts=static_mounts,
template_dir=template_dir,
plugin_extra_options=plugin_extra_options,
extra_serve_options=extra_serve_options,
)
ds.sqlite_functions.append(("sleep", 1, lambda n: time.sleep(float(n))))
client = TestClient(ds.app())
@ -389,7 +389,7 @@ def extra_template_vars(template, database, table, view_name, request, datasette
"extra_template_vars": json.dumps({
"template": template,
"scope_path": request.scope["path"],
"plugin_extra_options": datasette.plugin_extra_options,
"extra_serve_options": datasette.extra_serve_options,
}, default=lambda b: b.decode("utf8"))
}
"""

8
tests/test_plugins.py
View file

@ -203,7 +203,7 @@ def test_plugins_extra_template_vars(restore_working_directory):
assert {
"template": "show_json.html",
"scope_path": "/-/metadata",
"plugin_extra_options": {},
"extra_serve_options": {},
} == extra_template_vars
extra_template_vars_from_awaitable = json.loads(
Soup(response.body, "html.parser")
@ -217,14 +217,14 @@ def test_plugins_extra_template_vars(restore_working_directory):
} == extra_template_vars_from_awaitable
def test_plugin_extra_options_available_on_datasette(restore_working_directory):
def test_extra_serve_options_available_on_datasette(restore_working_directory):
for client in make_app_client(
template_dir=str(pathlib.Path(__file__).parent / "test_templates"),
plugin_extra_options={"foo": "bar"},
extra_serve_options={"foo": "bar"},
):
response = client.get("/-/metadata")
assert response.status == 200
extra_template_vars = json.loads(
Soup(response.body, "html.parser").select("pre.extra_template_vars")[0].text
)
assert {"foo": "bar"} == extra_template_vars["plugin_extra_options"]
assert {"foo": "bar"} == extra_template_vars["extra_serve_options"]