add test for template handler

echarles · echarles · commit 88d022dfe0ff · 2020-01-15T15:06:42.000+01:00
diff --git a/jupyter_server/extension/application.py b/jupyter_server/extension/application.py
@@ -351,6 +351,7 @@ def _prepare_templates(self):
             self.settings.update({
                 "{}_template_paths".format(self.extension_name): self.template_paths
             })
+        self.initialize_templates()
 
     @staticmethod
     def initialize_server(argv=[], load_other_extensions=True, **kwargs):
diff --git a/jupyter_server/pytest_plugin.py b/jupyter_server/pytest_plugin.py
@@ -52,7 +52,7 @@ def mkdir(tmp_path, *parts):
 config_dir = pytest.fixture(lambda tmp_path: mkdir(tmp_path, "config"))
 runtime_dir = pytest.fixture(lambda tmp_path: mkdir(tmp_path, "runtime"))
 root_dir = pytest.fixture(lambda tmp_path: mkdir(tmp_path, "root_dir"))
-template_dir = pytest.fixture(lambda tmp_path: mkdir(tmp_path, "template_dir"))
+template_dir = pytest.fixture(lambda tmp_path: mkdir(tmp_path, "templates"))
 system_jupyter_path = pytest.fixture(
     lambda tmp_path: mkdir(tmp_path, "share", "jupyter")
 )
diff --git a/tests/extension/conftest.py b/tests/extension/conftest.py
@@ -6,8 +6,8 @@
 from jupyter_core import paths
 from jupyter_server.extension import serverextension
 from jupyter_server.extension.serverextension import _get_config_dir
-from jupyter_server.extension.application import ExtensionApp
-from jupyter_server.extension.handler import ExtensionHandler
+from jupyter_server.extension.application import ExtensionApp, ExtensionAppJinjaMixin
+from jupyter_server.extension.handler import ExtensionHandler, ExtensionHandlerJinjaMixin
 
 # ----------------- Mock Extension App ----------------------
 
@@ -17,14 +17,21 @@ def get(self):
         self.finish(self.config.mock_trait)
 
 
-class MockExtensionApp(ExtensionApp):
+class MockExtensionTemplateHandler(ExtensionHandlerJinjaMixin, ExtensionHandler):
+
+    def get(self):
+        self.write(self.render_template("index.html"))
+
+
+class MockExtensionApp(ExtensionAppJinjaMixin, ExtensionApp):
     extension_name = 'mockextension'
     mock_trait = Unicode('mock trait', config=True)
 
     loaded = False
 
     def initialize_handlers(self):
         self.handlers.append(('/mock', MockExtensionHandler))
+        self.handlers.append(('/mock_template', MockExtensionTemplateHandler))
         self.loaded = True
 
     @staticmethod
@@ -39,6 +46,28 @@ def _make_mock_extension_app(**kwargs):
         kwargs.setdefault('template_paths', [str(template_dir)])
         return MockExtensionApp(**kwargs)
 
+    # TODO Should the index template creation be only be done only once?
+    index = template_dir.joinpath("index.html")    
+    index.write_text("""
+<!DOCTYPE HTML>
+<html>
+<head>
+    <meta charset="utf-8">
+    <title>{% block title %}Jupyter Server 1{% endblock %}</title>
+    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    {% block meta %}
+    {% endblock %}
+</head>
+<body>
+  <div id="site">
+    {% block site %}
+    {% endblock site %}
+  </div>
+  {% block after_site %}
+  {% endblock after_site %}
+</body>
+</html>""")
     return _make_mock_extension_app
 
 
diff --git a/tests/extension/test_handler.py b/tests/extension/test_handler.py
@@ -13,6 +13,14 @@ async def test_handler(fetch, extended_serverapp):
     assert r.body.decode() == 'mock trait'
 
 
+async def test_handler_template(fetch, extended_serverapp):
+    r = await fetch(
+        'mock_template',
+        method='GET'
+    )
+    assert r.code == 200
+
+
 async def test_handler_setting(fetch, serverapp, make_mock_extension_app):
     # Configure trait in Mock Extension.
     m = make_mock_extension_app(mock_trait='test mock trait')

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ def mkdir(tmp_path, *parts):`
`52`	`52`	`config_dir = pytest.fixture(lambda tmp_path: mkdir(tmp_path, "config"))`
`53`	`53`	`runtime_dir = pytest.fixture(lambda tmp_path: mkdir(tmp_path, "runtime"))`
`54`	`54`	`root_dir = pytest.fixture(lambda tmp_path: mkdir(tmp_path, "root_dir"))`
`55`		`-template_dir = pytest.fixture(lambda tmp_path: mkdir(tmp_path, "template_dir"))`
	`55`	`+template_dir = pytest.fixture(lambda tmp_path: mkdir(tmp_path, "templates"))`
`56`	`56`	`system_jupyter_path = pytest.fixture(`
`57`	`57`	`lambda tmp_path: mkdir(tmp_path, "share", "jupyter")`
`58`	`58`	`)`