X-Git-Url: https://git.madduck.net/etc/vim.git/blobdiff_plain/b1d060101626aa1c332f52e4bdf0ae5e4cc07990..3a2d76c7bcf39e852f3b379b76537d7847ed4225:/tests/test_no_ipynb.py?ds=inline diff --git a/tests/test_no_ipynb.py b/tests/test_no_ipynb.py index bcda2d5..12c820d 100644 --- a/tests/test_no_ipynb.py +++ b/tests/test_no_ipynb.py @@ -1,10 +1,10 @@ -import pytest -import os +import pathlib -from tests.util import THIS_DIR -from black import main, jupyter_dependencies_are_installed +import pytest from click.testing import CliRunner -from _pytest.tmpdir import tmpdir + +from black import jupyter_dependencies_are_installed, main +from tests.util import get_case_path pytestmark = pytest.mark.no_jupyter @@ -13,25 +13,24 @@ runner = CliRunner() 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" - "You can fix this by running ``pip install black[jupyter]``\n" + 'You can fix this by running ``pip install "black[jupyter]"``\n' ) 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() - nb = os.path.join("tests", "data", "notebook_trailing_newline.ipynb") - tmp_nb = tmpdir / "notebook.ipynb" - with open(nb) as src, open(tmp_nb, "w") as dst: - dst.write(src.read()) - result = runner.invoke(main, [str(tmpdir)]) + nb = get_case_path("jupyter", "notebook_trailing_newline.ipynb") + tmp_nb = tmp_path / "notebook.ipynb" + tmp_nb.write_bytes(nb.read_bytes()) + 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" + 'You can fix this by running ``pip install "black[jupyter]"``\n' ) assert expected_output in result.output