Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Isolate command line tests for notebooks from user-level config #2854

Merged
merged 1 commit into from
Feb 21, 2022
Merged

Isolate command line tests for notebooks from user-level config #2854

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions tests/test_ipynb.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@

JUPYTER_MODE = Mode(is_ipynb=True)

EMPTY_CONFIG = DATA_DIR / "empty_pyproject.toml"

runner = CliRunner()


Expand Down Expand Up @@ -410,6 +412,7 @@ def test_ipynb_diff_with_change() -> None:
[
str(DATA_DIR / "notebook_trailing_newline.ipynb"),
"--diff",
f"--config={EMPTY_CONFIG}",
],
)
expected = "@@ -1,3 +1,3 @@\n %%time\n \n-print('foo')\n" '+print("foo")\n'
Expand All @@ -422,6 +425,7 @@ def test_ipynb_diff_with_no_change() -> None:
[
str(DATA_DIR / "notebook_without_changes.ipynb"),
"--diff",
f"--config={EMPTY_CONFIG}",
],
)
expected = "1 file would be left unchanged."
Expand All @@ -440,13 +444,17 @@ def test_cache_isnt_written_if_no_jupyter_deps_single(
monkeypatch.setattr(
"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
jupyter_dependencies_are_installed.cache_clear()
monkeypatch.setattr(
"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


Expand All @@ -462,13 +470,13 @@ def test_cache_isnt_written_if_no_jupyter_deps_dir(
monkeypatch.setattr(
"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
jupyter_dependencies_are_installed.cache_clear()
monkeypatch.setattr(
"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


Expand All @@ -483,6 +491,7 @@ def test_ipynb_flag(tmp_path: pathlib.Path) -> None:
str(tmp_nb),
"--diff",
"--ipynb",
f"--config={EMPTY_CONFIG}",
],
)
expected = "@@ -1,3 +1,3 @@\n %%time\n \n-print('foo')\n" '+print("foo")\n'
Expand All @@ -498,6 +507,7 @@ def test_ipynb_and_pyi_flags() -> None:
"--pyi",
"--ipynb",
"--diff",
f"--config={EMPTY_CONFIG}",
],
)
assert isinstance(result.exception, SystemExit)
Expand Down