Isolate command line tests for notebooks from user-level config (#2854)
This commit is contained in:
parent
07a2e6f678
commit
50a856970d
@ -24,6 +24,8 @@
|
|||||||
|
|
||||||
JUPYTER_MODE = Mode(is_ipynb=True)
|
JUPYTER_MODE = Mode(is_ipynb=True)
|
||||||
|
|
||||||
|
EMPTY_CONFIG = DATA_DIR / "empty_pyproject.toml"
|
||||||
|
|
||||||
runner = CliRunner()
|
runner = CliRunner()
|
||||||
|
|
||||||
|
|
||||||
@ -410,6 +412,7 @@ def test_ipynb_diff_with_change() -> None:
|
|||||||
[
|
[
|
||||||
str(DATA_DIR / "notebook_trailing_newline.ipynb"),
|
str(DATA_DIR / "notebook_trailing_newline.ipynb"),
|
||||||
"--diff",
|
"--diff",
|
||||||
|
f"--config={EMPTY_CONFIG}",
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
expected = "@@ -1,3 +1,3 @@\n %%time\n \n-print('foo')\n" '+print("foo")\n'
|
expected = "@@ -1,3 +1,3 @@\n %%time\n \n-print('foo')\n" '+print("foo")\n'
|
||||||
@ -422,6 +425,7 @@ def test_ipynb_diff_with_no_change() -> None:
|
|||||||
[
|
[
|
||||||
str(DATA_DIR / "notebook_without_changes.ipynb"),
|
str(DATA_DIR / "notebook_without_changes.ipynb"),
|
||||||
"--diff",
|
"--diff",
|
||||||
|
f"--config={EMPTY_CONFIG}",
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
expected = "1 file would be left unchanged."
|
expected = "1 file would be left unchanged."
|
||||||
@ -440,13 +444,17 @@ def test_cache_isnt_written_if_no_jupyter_deps_single(
|
|||||||
monkeypatch.setattr(
|
monkeypatch.setattr(
|
||||||
"black.jupyter_dependencies_are_installed", lambda verbose, quiet: False
|
"black.jupyter_dependencies_are_installed", lambda verbose, quiet: False
|
||||||
)
|
)
|
||||||
result = runner.invoke(main, [str(tmp_path / "notebook.ipynb")])
|
result = runner.invoke(
|
||||||
|
main, [str(tmp_path / "notebook.ipynb"), f"--config={EMPTY_CONFIG}"]
|
||||||
|
)
|
||||||
assert "No Python files are present to be formatted. Nothing to do" in result.output
|
assert "No Python files are present to be formatted. Nothing to do" in result.output
|
||||||
jupyter_dependencies_are_installed.cache_clear()
|
jupyter_dependencies_are_installed.cache_clear()
|
||||||
monkeypatch.setattr(
|
monkeypatch.setattr(
|
||||||
"black.jupyter_dependencies_are_installed", lambda verbose, quiet: True
|
"black.jupyter_dependencies_are_installed", lambda verbose, quiet: True
|
||||||
)
|
)
|
||||||
result = runner.invoke(main, [str(tmp_path / "notebook.ipynb")])
|
result = runner.invoke(
|
||||||
|
main, [str(tmp_path / "notebook.ipynb"), f"--config={EMPTY_CONFIG}"]
|
||||||
|
)
|
||||||
assert "reformatted" in result.output
|
assert "reformatted" in result.output
|
||||||
|
|
||||||
|
|
||||||
@ -462,13 +470,13 @@ def test_cache_isnt_written_if_no_jupyter_deps_dir(
|
|||||||
monkeypatch.setattr(
|
monkeypatch.setattr(
|
||||||
"black.files.jupyter_dependencies_are_installed", lambda verbose, quiet: False
|
"black.files.jupyter_dependencies_are_installed", lambda verbose, quiet: False
|
||||||
)
|
)
|
||||||
result = runner.invoke(main, [str(tmp_path)])
|
result = runner.invoke(main, [str(tmp_path), f"--config={EMPTY_CONFIG}"])
|
||||||
assert "No Python files are present to be formatted. Nothing to do" in result.output
|
assert "No Python files are present to be formatted. Nothing to do" in result.output
|
||||||
jupyter_dependencies_are_installed.cache_clear()
|
jupyter_dependencies_are_installed.cache_clear()
|
||||||
monkeypatch.setattr(
|
monkeypatch.setattr(
|
||||||
"black.files.jupyter_dependencies_are_installed", lambda verbose, quiet: True
|
"black.files.jupyter_dependencies_are_installed", lambda verbose, quiet: True
|
||||||
)
|
)
|
||||||
result = runner.invoke(main, [str(tmp_path)])
|
result = runner.invoke(main, [str(tmp_path), f"--config={EMPTY_CONFIG}"])
|
||||||
assert "reformatted" in result.output
|
assert "reformatted" in result.output
|
||||||
|
|
||||||
|
|
||||||
@ -483,6 +491,7 @@ def test_ipynb_flag(tmp_path: pathlib.Path) -> None:
|
|||||||
str(tmp_nb),
|
str(tmp_nb),
|
||||||
"--diff",
|
"--diff",
|
||||||
"--ipynb",
|
"--ipynb",
|
||||||
|
f"--config={EMPTY_CONFIG}",
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
expected = "@@ -1,3 +1,3 @@\n %%time\n \n-print('foo')\n" '+print("foo")\n'
|
expected = "@@ -1,3 +1,3 @@\n %%time\n \n-print('foo')\n" '+print("foo")\n'
|
||||||
@ -498,6 +507,7 @@ def test_ipynb_and_pyi_flags() -> None:
|
|||||||
"--pyi",
|
"--pyi",
|
||||||
"--ipynb",
|
"--ipynb",
|
||||||
"--diff",
|
"--diff",
|
||||||
|
f"--config={EMPTY_CONFIG}",
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
assert isinstance(result.exception, SystemExit)
|
assert isinstance(result.exception, SystemExit)
|
||||||
|
Loading…
Reference in New Issue
Block a user