Prepare docs for release 22.6.0 (#3139)

[etc/vim.git] / tests / test_no_ipynb.py

diff --git a/tests/test_no_ipynb.py b/tests/test_no_ipynb.py
index bcda2d5369fc16a5c7903707cd1c5c7aa43e129f..a3c897760fb874a8909a78f2e0c3a665893544ff 100644 (file)
--- a/tests/test_no_ipynb.py
+++ b/tests/test_no_ipynb.py
@@ -1,10 +1,9 @@
 import pytest
 import pytest

-import os
+import pathlib

 
 

-from tests.util import THIS_DIR
+from tests.util import get_case_path

 from black import main, jupyter_dependencies_are_installed
 from click.testing import CliRunner
 from black import main, jupyter_dependencies_are_installed
 from click.testing import CliRunner

-from _pytest.tmpdir import tmpdir

 
 pytestmark = pytest.mark.no_jupyter
 
 
 pytestmark = pytest.mark.no_jupyter
 


@@ -13,7 +12,7 @@ runner = CliRunner()
 
 def test_ipynb_diff_with_no_change_single() -> None:
     jupyter_dependencies_are_installed.cache_clear()
 
 def test_ipynb_diff_with_no_change_single() -> None:
     jupyter_dependencies_are_installed.cache_clear()

-    path = THIS_DIR / "data/notebook_trailing_newline.ipynb"
+    path = get_case_path("jupyter", "notebook_trailing_newline.ipynb")

     result = runner.invoke(main, [str(path)])
     expected_output = (
         "Skipping .ipynb files as Jupyter dependencies are not installed.\n"
     result = runner.invoke(main, [str(path)])
     expected_output = (
         "Skipping .ipynb files as Jupyter dependencies are not installed.\n"


@@ -22,14 +21,14 @@ def test_ipynb_diff_with_no_change_single() -> None:
     assert expected_output in result.output
 
 
     assert expected_output in result.output
 
 

-def test_ipynb_diff_with_no_change_dir(tmpdir: tmpdir) -> None:
+def test_ipynb_diff_with_no_change_dir(tmp_path: pathlib.Path) -> None:

     jupyter_dependencies_are_installed.cache_clear()
     runner = CliRunner()
     jupyter_dependencies_are_installed.cache_clear()
     runner = CliRunner()

-    nb = os.path.join("tests", "data", "notebook_trailing_newline.ipynb")
-    tmp_nb = tmpdir / "notebook.ipynb"
+    nb = get_case_path("jupyter", "notebook_trailing_newline.ipynb")
+    tmp_nb = tmp_path / "notebook.ipynb"

     with open(nb) as src, open(tmp_nb, "w") as dst:
         dst.write(src.read())
     with open(nb) as src, open(tmp_nb, "w") as dst:
         dst.write(src.read())

-    result = runner.invoke(main, [str(tmpdir)])
+    result = runner.invoke(main, [str(tmp_path)])

     expected_output = (
         "Skipping .ipynb files as Jupyter dependencies are not installed.\n"
         "You can fix this by running ``pip install black[jupyter]``\n"
     expected_output = (
         "Skipping .ipynb files as Jupyter dependencies are not installed.\n"
         "You can fix this by running ``pip install black[jupyter]``\n"