mirror of
https://github.com/simonw/datasette.git
synced 2025-12-10 16:51:24 +01:00
Datasette() constructor no longer requires files=, closes #1563
This commit is contained in:
parent
83bacfa945
commit
359140ceda
2 changed files with 19 additions and 2 deletions
|
|
@ -191,7 +191,7 @@ class Datasette:
|
||||||
|
|
||||||
def __init__(
|
def __init__(
|
||||||
self,
|
self,
|
||||||
files,
|
files=None,
|
||||||
immutables=None,
|
immutables=None,
|
||||||
cache_headers=True,
|
cache_headers=True,
|
||||||
cors=False,
|
cors=False,
|
||||||
|
|
@ -214,7 +214,7 @@ class Datasette:
|
||||||
), "config_dir= should be a pathlib.Path"
|
), "config_dir= should be a pathlib.Path"
|
||||||
self.pdb = pdb
|
self.pdb = pdb
|
||||||
self._secret = secret or secrets.token_hex(32)
|
self._secret = secret or secrets.token_hex(32)
|
||||||
self.files = tuple(files) + tuple(immutables or [])
|
self.files = tuple(files or []) + tuple(immutables or [])
|
||||||
if config_dir:
|
if config_dir:
|
||||||
self.files += tuple([str(p) for p in config_dir.glob("*.db")])
|
self.files += tuple([str(p) for p in config_dir.glob("*.db")])
|
||||||
if (
|
if (
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
"""
|
"""
|
||||||
Tests for the datasette.app.Datasette class
|
Tests for the datasette.app.Datasette class
|
||||||
"""
|
"""
|
||||||
|
from datasette.app import Datasette
|
||||||
from itsdangerous import BadSignature
|
from itsdangerous import BadSignature
|
||||||
from .fixtures import app_client
|
from .fixtures import app_client
|
||||||
import pytest
|
import pytest
|
||||||
|
|
@ -45,3 +46,19 @@ def test_sign_unsign(datasette, value, namespace):
|
||||||
)
|
)
|
||||||
def test_datasette_setting(datasette, setting, expected):
|
def test_datasette_setting(datasette, setting, expected):
|
||||||
assert datasette.setting(setting) == expected
|
assert datasette.setting(setting) == expected
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_datasette_constructor():
|
||||||
|
ds = Datasette(memory=True)
|
||||||
|
databases = (await ds.client.get("/-/databases.json")).json()
|
||||||
|
assert databases == [
|
||||||
|
{
|
||||||
|
"name": "_memory",
|
||||||
|
"path": None,
|
||||||
|
"size": 0,
|
||||||
|
"is_mutable": False,
|
||||||
|
"is_memory": True,
|
||||||
|
"hash": None,
|
||||||
|
}
|
||||||
|
]
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue