fix: format all code with black
and from now on should not deviate from that...
This commit is contained in:
parent
8a09fb1a3c
commit
4d0693862d
68 changed files with 6693 additions and 5659 deletions
|
|
@ -36,34 +36,34 @@ class TestMakeWuttaConfig(FileTestCase):
|
|||
def test_basic(self):
|
||||
|
||||
# mock path to config file
|
||||
myconf = self.write_file('my.conf', '')
|
||||
settings = {'wutta.config': myconf}
|
||||
myconf = self.write_file("my.conf", "")
|
||||
settings = {"wutta.config": myconf}
|
||||
|
||||
# can make a config okay
|
||||
config = mod.make_wutta_config(settings)
|
||||
|
||||
# and that config is also stored in settings
|
||||
self.assertIn('wutta_config', settings)
|
||||
self.assertIs(settings['wutta_config'], config)
|
||||
self.assertIn("wutta_config", settings)
|
||||
self.assertIs(settings["wutta_config"], config)
|
||||
|
||||
|
||||
class TestMakePyramidConfig(DataTestCase):
|
||||
|
||||
def test_basic(self):
|
||||
with patch.object(AppHandler, 'make_session', return_value=self.session):
|
||||
settings = {'wutta_config': self.config}
|
||||
with patch.object(AppHandler, "make_session", return_value=self.session):
|
||||
settings = {"wutta_config": self.config}
|
||||
config = mod.make_pyramid_config(settings)
|
||||
self.assertIsInstance(config, Configurator)
|
||||
self.assertEqual(settings['wuttaweb.theme'], 'default')
|
||||
self.assertEqual(settings["wuttaweb.theme"], "default")
|
||||
|
||||
|
||||
class TestMain(DataTestCase):
|
||||
|
||||
def test_basic(self):
|
||||
with patch.object(AppHandler, 'make_session', return_value=self.session):
|
||||
with patch.object(AppHandler, "make_session", return_value=self.session):
|
||||
global_config = None
|
||||
myconf = self.write_file('my.conf', '')
|
||||
settings = {'wutta.config': myconf}
|
||||
myconf = self.write_file("my.conf", "")
|
||||
settings = {"wutta.config": myconf}
|
||||
app = mod.main(global_config, **settings)
|
||||
self.assertIsInstance(app, Router)
|
||||
|
||||
|
|
@ -73,9 +73,9 @@ def mock_main(global_config, **settings):
|
|||
wutta_config = mod.make_wutta_config(settings)
|
||||
pyramid_config = mod.make_pyramid_config(settings)
|
||||
|
||||
pyramid_config.include('wuttaweb.static')
|
||||
pyramid_config.include('wuttaweb.subscribers')
|
||||
pyramid_config.include('wuttaweb.views')
|
||||
pyramid_config.include("wuttaweb.static")
|
||||
pyramid_config.include("wuttaweb.subscribers")
|
||||
pyramid_config.include("wuttaweb.views")
|
||||
|
||||
return pyramid_config.make_wsgi_app()
|
||||
|
||||
|
|
@ -83,26 +83,26 @@ def mock_main(global_config, **settings):
|
|||
class TestMakeWsgiApp(DataTestCase):
|
||||
|
||||
def test_with_callable(self):
|
||||
with patch.object(self.app, 'make_session', return_value=self.session):
|
||||
with patch.object(self.app, "make_session", return_value=self.session):
|
||||
|
||||
# specify config
|
||||
wsgi = mod.make_wsgi_app(mock_main, config=self.config)
|
||||
self.assertIsInstance(wsgi, Router)
|
||||
|
||||
# auto config
|
||||
with patch.object(mod, 'make_config', return_value=self.config):
|
||||
with patch.object(mod, "make_config", return_value=self.config):
|
||||
wsgi = mod.make_wsgi_app(mock_main)
|
||||
self.assertIsInstance(wsgi, Router)
|
||||
|
||||
def test_with_spec(self):
|
||||
|
||||
# specify config
|
||||
wsgi = mod.make_wsgi_app('tests.test_app:mock_main', config=self.config)
|
||||
wsgi = mod.make_wsgi_app("tests.test_app:mock_main", config=self.config)
|
||||
self.assertIsInstance(wsgi, Router)
|
||||
|
||||
# auto config
|
||||
with patch.object(mod, 'make_config', return_value=self.config):
|
||||
wsgi = mod.make_wsgi_app('tests.test_app:mock_main')
|
||||
with patch.object(mod, "make_config", return_value=self.config):
|
||||
wsgi = mod.make_wsgi_app("tests.test_app:mock_main")
|
||||
self.assertIsInstance(wsgi, Router)
|
||||
|
||||
def test_invalid(self):
|
||||
|
|
@ -112,27 +112,27 @@ class TestMakeWsgiApp(DataTestCase):
|
|||
class TestMakeAsgiApp(DataTestCase):
|
||||
|
||||
def test_with_callable(self):
|
||||
with patch.object(self.app, 'make_session', return_value=self.session):
|
||||
with patch.object(self.app, "make_session", return_value=self.session):
|
||||
|
||||
# specify config
|
||||
asgi = mod.make_asgi_app(mock_main, config=self.config)
|
||||
self.assertIsInstance(asgi, WsgiToAsgi)
|
||||
|
||||
# auto config
|
||||
with patch.object(mod, 'make_config', return_value=self.config):
|
||||
with patch.object(mod, "make_config", return_value=self.config):
|
||||
asgi = mod.make_asgi_app(mock_main)
|
||||
self.assertIsInstance(asgi, WsgiToAsgi)
|
||||
|
||||
def test_with_spec(self):
|
||||
with patch.object(self.app, 'make_session', return_value=self.session):
|
||||
with patch.object(self.app, "make_session", return_value=self.session):
|
||||
|
||||
# specify config
|
||||
asgi = mod.make_asgi_app('tests.test_app:mock_main', config=self.config)
|
||||
asgi = mod.make_asgi_app("tests.test_app:mock_main", config=self.config)
|
||||
self.assertIsInstance(asgi, WsgiToAsgi)
|
||||
|
||||
# auto config
|
||||
with patch.object(mod, 'make_config', return_value=self.config):
|
||||
asgi = mod.make_asgi_app('tests.test_app:mock_main')
|
||||
with patch.object(mod, "make_config", return_value=self.config):
|
||||
asgi = mod.make_asgi_app("tests.test_app:mock_main")
|
||||
self.assertIsInstance(asgi, WsgiToAsgi)
|
||||
|
||||
def test_invalid(self):
|
||||
|
|
@ -143,53 +143,65 @@ class TestEstablishTheme(DataTestCase):
|
|||
|
||||
def test_default(self):
|
||||
settings = {
|
||||
'wutta_config': self.config,
|
||||
'mako.directories': ['wuttaweb:templates'],
|
||||
"wutta_config": self.config,
|
||||
"mako.directories": ["wuttaweb:templates"],
|
||||
}
|
||||
mod.establish_theme(settings)
|
||||
self.assertEqual(settings['wuttaweb.theme'], 'default')
|
||||
self.assertEqual(settings['mako.directories'], [
|
||||
resource_path('wuttaweb:templates/themes/default'),
|
||||
'wuttaweb:templates',
|
||||
])
|
||||
self.assertEqual(settings["wuttaweb.theme"], "default")
|
||||
self.assertEqual(
|
||||
settings["mako.directories"],
|
||||
[
|
||||
resource_path("wuttaweb:templates/themes/default"),
|
||||
"wuttaweb:templates",
|
||||
],
|
||||
)
|
||||
|
||||
def test_mako_dirs_as_string(self):
|
||||
settings = {
|
||||
'wutta_config': self.config,
|
||||
'mako.directories': 'wuttaweb:templates',
|
||||
"wutta_config": self.config,
|
||||
"mako.directories": "wuttaweb:templates",
|
||||
}
|
||||
mod.establish_theme(settings)
|
||||
self.assertEqual(settings['wuttaweb.theme'], 'default')
|
||||
self.assertEqual(settings['mako.directories'], [
|
||||
resource_path('wuttaweb:templates/themes/default'),
|
||||
'wuttaweb:templates',
|
||||
])
|
||||
self.assertEqual(settings["wuttaweb.theme"], "default")
|
||||
self.assertEqual(
|
||||
settings["mako.directories"],
|
||||
[
|
||||
resource_path("wuttaweb:templates/themes/default"),
|
||||
"wuttaweb:templates",
|
||||
],
|
||||
)
|
||||
|
||||
def test_butterfly(self):
|
||||
settings = {
|
||||
'wutta_config': self.config,
|
||||
'mako.directories': 'wuttaweb:templates',
|
||||
"wutta_config": self.config,
|
||||
"mako.directories": "wuttaweb:templates",
|
||||
}
|
||||
self.app.save_setting(self.session, 'wuttaweb.theme', 'butterfly')
|
||||
self.app.save_setting(self.session, "wuttaweb.theme", "butterfly")
|
||||
self.session.commit()
|
||||
mod.establish_theme(settings)
|
||||
self.assertEqual(settings['wuttaweb.theme'], 'butterfly')
|
||||
self.assertEqual(settings['mako.directories'], [
|
||||
resource_path('wuttaweb:templates/themes/butterfly'),
|
||||
'wuttaweb:templates',
|
||||
])
|
||||
self.assertEqual(settings["wuttaweb.theme"], "butterfly")
|
||||
self.assertEqual(
|
||||
settings["mako.directories"],
|
||||
[
|
||||
resource_path("wuttaweb:templates/themes/butterfly"),
|
||||
"wuttaweb:templates",
|
||||
],
|
||||
)
|
||||
|
||||
def test_custom(self):
|
||||
settings = {
|
||||
'wutta_config': self.config,
|
||||
'mako.directories': 'wuttaweb:templates',
|
||||
"wutta_config": self.config,
|
||||
"mako.directories": "wuttaweb:templates",
|
||||
}
|
||||
self.config.setdefault('wuttaweb.themes.keys', 'anotherone')
|
||||
self.app.save_setting(self.session, 'wuttaweb.theme', 'anotherone')
|
||||
self.config.setdefault("wuttaweb.themes.keys", "anotherone")
|
||||
self.app.save_setting(self.session, "wuttaweb.theme", "anotherone")
|
||||
self.session.commit()
|
||||
mod.establish_theme(settings)
|
||||
self.assertEqual(settings['wuttaweb.theme'], 'anotherone')
|
||||
self.assertEqual(settings['mako.directories'], [
|
||||
resource_path('wuttaweb:templates/themes/anotherone'),
|
||||
'wuttaweb:templates',
|
||||
])
|
||||
self.assertEqual(settings["wuttaweb.theme"], "anotherone")
|
||||
self.assertEqual(
|
||||
settings["mako.directories"],
|
||||
[
|
||||
resource_path("wuttaweb:templates/themes/anotherone"),
|
||||
"wuttaweb:templates",
|
||||
],
|
||||
)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue