Merge pull request #37 from afshin/update-pytest

Update jupyter_server version, update to use prefixed fixtures

setup.py

@@ -55,7 +55,7 @@
     python_requires='>=3.6',
     include_package_data=True,
     install_requires = [
-        'jupyter_server~=1.0.1',
+        'jupyter_server~=1.1',
         'notebook<7',
     ],
     entry_points = {

tests/conftest.py

@@ -4,6 +4,8 @@
 from traitlets import default
 from nbclassic.notebookapp import NotebookApp
 
+pytest_plugins = ["jupyter_server.pytest_plugin"]
+
 
 @pytest.fixture
 def nbapp_log():
@@ -37,7 +39,7 @@ def _log_default(self):
 
 
 @pytest.fixture
-def server_config():
+def jp_server_config():
     return {
         "ServerApp": {
             "jpserver_extensions": {

tests/shim/test_extension.py

@@ -40,7 +40,7 @@ def _log_default(self):
 
 
 @pytest.fixture
-def server_config():
+def jp_server_config():
     return {
         "ServerApp": {
             "jpserver_extensions": {
@@ -52,8 +52,8 @@ def server_config():
 
 
 @pytest.fixture
-def extensionapp(serverapp):
-    return serverapp.extension_manager.extension_points["mockextension"].app
+def extensionapp(jp_serverapp):
+    return jp_serverapp.extension_manager.extension_points["mockextension"].app
 
 
 def list_test_params(param_input):
@@ -71,15 +71,15 @@ def list_test_params(param_input):
 
 
 @pytest.mark.parametrize(
-    'argv,trait_name,trait_value',
+    'jp_argv,trait_name,trait_value',
     list_test_params([
         ('enable_mathjax', False)
     ])
 )
 def test_EXTAPP_AND_NBAPP_SHIM_MSG(
     extensionapp,
     extapp_log,
-    argv,
+    jp_argv,
     trait_name,
     trait_value
 ):
@@ -92,7 +92,7 @@ def test_EXTAPP_AND_NBAPP_SHIM_MSG(
 
 
 @pytest.mark.parametrize(
-    'argv,trait_name,trait_value',
+    'jp_argv,trait_name,trait_value',
     list_test_params([
         ('allow_origin', ''),
         ('allow_origin_pat', ''),
@@ -101,7 +101,7 @@ def test_EXTAPP_AND_NBAPP_SHIM_MSG(
 def test_EXTAPP_AND_SVAPP_SHIM_MSG(
     extensionapp,
     extapp_log,
-    argv,
+    jp_argv,
     trait_name,
     trait_value
 ):
@@ -114,7 +114,7 @@ def test_EXTAPP_AND_SVAPP_SHIM_MSG(
 
 
 @pytest.mark.parametrize(
-    'argv,trait_name,trait_value',
+    'jp_argv,trait_name,trait_value',
     list_test_params([
         ('jinja_environment_options', {}),
         ('jinja_template_vars', {}),
@@ -125,7 +125,7 @@ def test_EXTAPP_AND_SVAPP_SHIM_MSG(
 def test_NOT_EXTAPP_NBAPP_AND_SVAPP_SHIM_MSG(
     extensionapp,
     extapp_log,
-    argv,
+    jp_argv,
     trait_name,
     trait_value
 ):
@@ -138,15 +138,15 @@ def test_NOT_EXTAPP_NBAPP_AND_SVAPP_SHIM_MSG(
 
 
 @pytest.mark.parametrize(
-    'argv,trait_name,trait_value',
+    'jp_argv,trait_name,trait_value',
     list_test_params([
         ('allow_credentials', False),
     ])
 )
 def test_EXTAPP_TO_SVAPP_SHIM_MSG(
     extensionapp,
     extapp_log,
-    argv,
+    jp_argv,
     trait_name,
     trait_value
 ):
@@ -159,7 +159,7 @@ def test_EXTAPP_TO_SVAPP_SHIM_MSG(
 
 
 @pytest.mark.parametrize(
-    'argv,trait_name,trait_value',
+    'jp_argv,trait_name,trait_value',
     list_test_params([
         ('mathjax_config', 'TEST'),
         ('mathjax_url', 'TEST')
@@ -168,7 +168,7 @@ def test_EXTAPP_TO_SVAPP_SHIM_MSG(
 def test_EXTAPP_TO_NBAPP_SHIM_MSG(
     extensionapp,
     extapp_log,
-    argv,
+    jp_argv,
     trait_name,
     trait_value
 ):

tests/shim/test_nbclassic.py

@@ -3,7 +3,7 @@
 
 
 @pytest.fixture
-def server_config():
+def jp_server_config():
     return {
         "ServerApp": {
             "jpserver_extensions": {
@@ -15,8 +15,8 @@ def server_config():
 
 
 @pytest.fixture
-def nbclassic(serverapp):
-    return serverapp.extension_manager.extension_points["nbclassic"].app
+def nbclassic(jp_serverapp):
+    return jp_serverapp.extension_manager.extension_points["nbclassic"].app
 
 
 def list_test_params(param_input):
@@ -33,7 +33,7 @@ def list_test_params(param_input):
 
 
 @pytest.mark.parametrize(
-    'argv,trait_name,trait_value',
+    'jp_argv,trait_name,trait_value',
     list_test_params([
         ('jinja_environment_options', {}),
         ('jinja_template_vars', {}),
@@ -44,7 +44,7 @@ def list_test_params(param_input):
 def test_NBAPP_AND_SVAPP_SHIM_MSG(
     nbclassic,
     nbapp_log,
-    argv,
+    jp_argv,
     trait_name,
     trait_value
 ):
@@ -56,7 +56,7 @@ def test_NBAPP_AND_SVAPP_SHIM_MSG(
 
 
 @pytest.mark.parametrize(
-    'argv,trait_name,trait_value',
+    'jp_argv,trait_name,trait_value',
     list_test_params([
         ('allow_origin', ''),
         ('allow_origin_pat', ''),
@@ -65,9 +65,9 @@ def test_NBAPP_AND_SVAPP_SHIM_MSG(
     ])
 )
 def test_NBAPP_TO_SVAPP_SHIM_MSG(
-    serverapp,
+    jp_serverapp,
     nbapp_log,
-    argv,
+    jp_argv,
     trait_name,
     trait_value
 ):
@@ -77,11 +77,11 @@ def test_NBAPP_TO_SVAPP_SHIM_MSG(
     # Verify a warning message was raised
     assert expected_msg in log
     # Verify that trait changed.
-    assert getattr(serverapp, trait_name) == trait_value
+    assert getattr(jp_serverapp, trait_name) == trait_value
 
 
 @pytest.mark.parametrize(
-    'argv,trait_name,trait_value',
+    'jp_argv,trait_name,trait_value',
     list_test_params([
         #('ignore_minified_js', True),
         ('enable_mathjax', False),
@@ -91,7 +91,7 @@ def test_NBAPP_TO_SVAPP_SHIM_MSG(
 )
 def test_nbclassic_traits_pass_shim(
     nbclassic,
-    argv,
+    jp_argv,
     trait_name,
     trait_value
 ):

tests/test_notebookapp.py

@@ -5,19 +5,19 @@
 
 
 @pytest.fixture
-def notebooks(create_notebook):
+def notebooks(jp_create_notebook):
     nbpaths = (
         'notebook1.ipynb',
         'nbclassic_test_notebooks/notebook2.ipynb',
         'nbclassic_test_notebooks/level2/notebook3.ipynb'
     )
     for nb in nbpaths:
-        create_notebook(nb)
+        jp_create_notebook(nb)
     return nbpaths
 
 
-async def test_tree_handler(notebooks, fetch):
-    r = await fetch('tree', 'nbclassic_test_notebooks')
+async def test_tree_handler(notebooks, jp_fetch):
+    r = await jp_fetch('tree', 'nbclassic_test_notebooks')
     assert r.code == 200
 
     # Check that the tree template is loaded
@@ -27,9 +27,9 @@ async def test_tree_handler(notebooks, fetch):
     assert "Clusters" in html
 
 
-async def test_notebook_handler(notebooks, fetch):
+async def test_notebook_handler(notebooks, jp_fetch):
     for nbpath in notebooks:
-        r = await fetch('notebooks', nbpath)
+        r = await jp_fetch('notebooks', nbpath)
         assert r.code == 200
         # Check that the notebook template is loaded
         html = r.body.decode()