diff --git a/tests/conftest.py b/tests/conftest.py index 6e18a59..3067a4c 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -1,3 +1,4 @@ +import os import tempfile import pytest @@ -11,5 +12,6 @@ def runner(): @pytest.fixture def tmp_file(): - with tempfile.NamedTemporaryFile() as tmp: - yield tmp + tmp = tempfile.NamedTemporaryFile(delete=False) + yield tmp + os.unlink(tmp.name) diff --git a/tests/test_djlint.py b/tests/test_djlint.py index 7af5e24..dcd3b3b 100644 --- a/tests/test_djlint.py +++ b/tests/test_djlint.py @@ -10,6 +10,7 @@ or:: tox """ +from pathlib import Path from src.djlint import main as djlint @@ -39,24 +40,24 @@ def test_bad_file(runner): def test_good_file(runner): result = runner.invoke(djlint, ["tests/bad.html"]) assert result.exit_code == 0 - assert "tests/bad.html" in result.output + assert str(Path("tests/bad.html")) in result.output def test_bad_path(runner): result = runner.invoke(djlint, ["tests/nowhere"]) assert result.exit_code == 2 - assert "Path 'tests/nowhere' does not exist." in result.output + assert "does not exist." in result.output def test_good_path_with_ext(runner): result = runner.invoke(djlint, ["tests/", "-e", "html"]) assert result.exit_code == 0 - assert "tests/bad.html" in result.output + assert str(Path("tests/bad.html")) in result.output result = runner.invoke(djlint, ["tests/", "--extension", "html*"]) assert result.exit_code == 0 - assert "tests/bad.html" in result.output - assert "tests/bad.html.dj" in result.output + assert str(Path("tests/bad.html")) in result.output + assert str(Path("tests/bad.html.dj")) in result.output def test_good_path_with_bad_ext(runner): @@ -66,15 +67,13 @@ def test_good_path_with_bad_ext(runner): def test_empty_file(runner, tmp_file): - tmp_file.write(b"") - tmp_file.seek(0) + open(tmp_file.name, mode="wb").write(b"") result = runner.invoke(djlint, [tmp_file.name]) assert result.exit_code == 0 def test_E001(runner, tmp_file): - tmp_file.write(b"{{test }}\n{% test%}") - tmp_file.seek(0) + open(tmp_file.name, mode="wb").write(b"{{test }}\n{% test%}") result = runner.invoke(djlint, [tmp_file.name]) assert result.exit_code == 0 assert "E001 1:" in result.output @@ -82,95 +81,84 @@ def test_E001(runner, tmp_file): def test_E002(runner, tmp_file): - tmp_file.write(b"{% extends 'this' %}") - tmp_file.seek(0) + open(tmp_file.name, mode="wb").write(b"{% extends 'this' %}") result = runner.invoke(djlint, [tmp_file.name]) assert result.exit_code == 0 assert "E002 1:" in result.output def test_W003(runner, tmp_file): - tmp_file.write(b"{% endblock %}") - tmp_file.seek(0) + open(tmp_file.name, mode="wb").write(b"{% endblock %}") result = runner.invoke(djlint, [tmp_file.name]) assert result.exit_code == 0 assert "W003 1:" in result.output def test_W004(runner, tmp_file): - tmp_file.write(b'') - tmp_file.seek(0) + open(tmp_file.name, mode="wb").write(b'') result = runner.invoke(djlint, [tmp_file.name]) assert result.exit_code == 0 assert "W004 1:" in result.output def test_W005(runner, tmp_file): - tmp_file.write(b"\n") - tmp_file.seek(0) + open(tmp_file.name, mode="wb").write(b"\n") result = runner.invoke(djlint, [tmp_file.name]) assert result.exit_code == 0 assert "W005 2:" in result.output def test_W006(runner, tmp_file): - tmp_file.write(b"") - tmp_file.seek(0) + open(tmp_file.name, mode="wb").write(b"") result = runner.invoke(djlint, [tmp_file.name]) assert result.exit_code == 0 assert "W006 1:" in result.output def test_W007(runner, tmp_file): - tmp_file.write(b'') - tmp_file.seek(0) + open(tmp_file.name, mode="wb").write(b'') result = runner.invoke(djlint, [tmp_file.name]) assert result.exit_code == 0 assert "W007 1:" in result.output def test_W008(runner, tmp_file): - tmp_file.write(b"
") - tmp_file.seek(0) + open(tmp_file.name, mode="wb").write(b"
") result = runner.invoke(djlint, [tmp_file.name]) assert result.exit_code == 0 assert "W008 1:" in result.output def test_W009(runner, tmp_file): - tmp_file.write(b"

") - tmp_file.seek(0) + open(tmp_file.name, mode="wb").write(b"

") result = runner.invoke(djlint, [tmp_file.name]) assert result.exit_code == 0 assert "W009 1:" in result.output def test_W010(runner, tmp_file): - tmp_file.write(b'') - tmp_file.seek(0) + open(tmp_file.name, mode="wb").write(b'') result = runner.invoke(djlint, [tmp_file.name]) assert result.exit_code == 0 assert "W010 1:" in result.output def test_W011(runner, tmp_file): - tmp_file.write(b"
") - tmp_file.seek(0) + open(tmp_file.name, mode="wb").write(b"
") result = runner.invoke(djlint, [tmp_file.name]) assert result.exit_code == 0 assert "W011 1:" in result.output def test_W012(runner, tmp_file): - tmp_file.write(b'
') - tmp_file.seek(0) + open(tmp_file.name, mode="wb").write(b'
') result = runner.invoke(djlint, [tmp_file.name]) assert result.exit_code == 0 assert "W012 1:" in result.output def test_W013(runner, tmp_file): - tmp_file.write( + open(tmp_file.name, mode="wb").write( b"this is a very long line of random long text that is very long and should not be so long, hopefully it thows an error somwhere" ) tmp_file.seek(0) @@ -180,24 +168,21 @@ def test_W013(runner, tmp_file): def test_W014(runner, tmp_file): - tmp_file.write(b"
\n\n\n

") - tmp_file.seek(0) + open(tmp_file.name, mode="wb").write(b"

\n\n\n

") result = runner.invoke(djlint, [tmp_file.name]) assert result.exit_code == 0 assert "W014 1:" in result.output def test_W015(runner, tmp_file): - tmp_file.write(b"

") - tmp_file.seek(0) + open(tmp_file.name, mode="wb").write(b"

") result = runner.invoke(djlint, [tmp_file.name]) assert result.exit_code == 0 assert "W015 1:" in result.output def test_W016(runner, tmp_file): - tmp_file.write(b"\nstuff\n") - tmp_file.seek(0) + open(tmp_file.name, mode="wb").write(b"\nstuff\n") result = runner.invoke(djlint, [tmp_file.name]) assert result.exit_code == 0 assert "W016 1:" in result.output