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

static_mounts mechanism works again, refs #272

Browse source
This commit is contained in:
Simon Willison 2019-06-22 22:42:23 -07:00
commit eb06e59332
3 changed files with 15 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
datasette/app.py
View file

@ -600,8 +600,8 @@ class Datasette:
add_route( add_route(
asgi_static(app_root / "datasette" / "static"), r"/-/static/(?P<path>.*)$" asgi_static(app_root / "datasette" / "static"), r"/-/static/(?P<path>.*)$"
) )
# for path, dirname in self.static_mounts: for path, dirname in self.static_mounts:
# app.static(path, dirname) add_route(asgi_static(dirname), r"/" + path + "/(?P<path>.*)$")
# Mount any plugin static/ directories # Mount any plugin static/ directories
for plugin in get_plugins(pm): for plugin in get_plugins(pm):

2
tests/fixtures.py
View file

@ -82,6 +82,7 @@ def make_app_client(
is_immutable=False, is_immutable=False,
extra_databases=None, extra_databases=None,
inspect_data=None, inspect_data=None,
static_mounts=None,
): ):
with tempfile.TemporaryDirectory() as tmpdir: with tempfile.TemporaryDirectory() as tmpdir:
filepath = os.path.join(tmpdir, filename) filepath = os.path.join(tmpdir, filename)
@ -123,6 +124,7 @@ def make_app_client(
plugins_dir=plugins_dir, plugins_dir=plugins_dir,
config=config, config=config,
inspect_data=inspect_data, inspect_data=inspect_data,
static_mounts=static_mounts,
) )
ds.sqlite_functions.append(("sleep", 1, lambda n: time.sleep(float(n)))) ds.sqlite_functions.append(("sleep", 1, lambda n: time.sleep(float(n))))
client = TestClient(ds.app()) client = TestClient(ds.app())

11
tests/test_html.py
View file

@ -8,6 +8,7 @@ from .fixtures import ( # noqa
METADATA, METADATA,
) )
import json import json
import pathlib
import pytest import pytest
import re import re
import urllib.parse import urllib.parse
@ -52,6 +53,16 @@ def test_static(app_client):
assert "text/css" == response.headers["content-type"] assert "text/css" == response.headers["content-type"]
def test_static_mounts():
for client in make_app_client(
static_mounts=[("custom-static", str(pathlib.Path(__file__).parent))]
):
response = client.get("/custom-static/test_html.py")
assert response.status == 200
response = client.get("/custom-static/not_exists.py")
assert response.status == 404
def test_memory_database_page(): def test_memory_database_page():
for client in make_app_client(memory=True): for client in make_app_client(memory=True):
response = client.get("/:memory:") response = client.get("/:memory:")