djlint 1.30.0 → 1.30.2

package/tests/test_django/test_spaceless.py

@@ -1,30 +0,0 @@
-"""Test django spaceless tag.
-
-poetry run pytest tests/test_django/test_spaceless.py
-"""
-import pytest
-
-from src.djlint.reformat import formatter
-from tests.conftest import printer
-
-test_data = [
-    pytest.param(
-        ('{% spaceless %}<p><a href="foo/">Foo</a></p>{% endspaceless %}'),
-        (
-            "{% spaceless %}\n"
-            "    <p>\n"
-            '        <a href="foo/">Foo</a>\n'
-            "    </p>\n"
-            "{% endspaceless %}\n"
-        ),
-        id="spaceless_tag",
-    ),
-]
-
-
-@pytest.mark.parametrize(("source", "expected"), test_data)
-def test_base(source, expected, django_config):
-    output = formatter(django_config, source)
-
-    printer(expected, source, output)
-    assert expected == output

package/tests/test_django/test_tag_spaces.py

@@ -1,35 +0,0 @@
-"""Test django spaceless tag.
-
-poetry run pytest tests/test_django/test_tag_spaces.py
-"""
-import pytest
-
-from src.djlint.reformat import formatter
-from tests.conftest import config_builder, printer
-
-test_data = [
-    pytest.param(
-        ("{% a %}\n" "{%b       %}{%+c%}{%-d+%}\n" "{#a}{{g {%a%}}}{%l{{q}}+%}"),
-        (
-            "{% a %}\n"
-            "{% b %}{%+ c %}{%- d +%}\n"
-            "{#a}{{ g {% a % }}}{% l{{ q }} +%}\n"
-        ),
-        ({}),
-        id="messy stuff",
-    ),
-    pytest.param(
-        ("{% a %}\n" "{%b%}{%c%}{%-d+%}\n" "{#a}{{g {%a%}}}{%l{{q}}+%}"),
-        ("{% a %}\n" "{%b%}{%c%}{%-d+%}\n" "{#a}{{g {%a%}}}{%l{{q}}+%}\n"),
-        ({"profile": "handlebars"}),
-        id="messy stuff",
-    ),
-]
-
-
-@pytest.mark.parametrize(("source", "expected", "args"), test_data)
-def test_base(source, expected, args):
-    output = formatter(config_builder(args), source)
-
-    printer(expected, source, output)
-    assert expected == output

package/tests/test_django/test_templatetag.py

@@ -1,40 +0,0 @@
-"""Test django templatetags.
-
-poetry run pytest tests/test_django/test_templatetag.py
-"""
-import pytest
-
-from src.djlint.reformat import formatter
-from tests.conftest import printer
-
-test_data = [
-    pytest.param(
-        ("{% if stuff %}\n{% endif %}"),
-        ("{% if stuff %}{% endif %}\n"),
-        id="tags_on_one_line",
-    ),
-    pytest.param(
-        ("{% templatetag openblock %} url 'entry_list' {% templatetag closeblock %}"),
-        ("{% templatetag openblock %} url 'entry_list' {% templatetag closeblock %}\n"),
-        id="tags_random_text",
-    ),
-    pytest.param(
-        (
-            "{% if messages|length %}{% for message in messages %}{{ message }}{% endfor %}{% endif %}"
-        ),
-        (
-            "{% if messages|length %}\n"
-            "    {% for message in messages %}{{ message }}{% endfor %}\n"
-            "{% endif %}\n"
-        ),
-        id="single_liner",
-    ),
-]
-
-
-@pytest.mark.parametrize(("source", "expected"), test_data)
-def test_base(source, expected, django_config):
-    output = formatter(django_config, source)
-
-    printer(expected, source, output)
-    assert expected == output

package/tests/test_django/test_verbatim.py

@@ -1,24 +0,0 @@
-"""Test django verbatim tag.
-
-poetry run pytest tests/test_django/test_verbatim.py
-"""
-import pytest
-
-from src.djlint.reformat import formatter
-from tests.conftest import printer
-
-test_data = [
-    pytest.param(
-        ("{% verbatim %}Still alive.{% endverbatim %}"),
-        ("{% verbatim %}\n" "    Still alive.\n" "{% endverbatim %}\n"),
-        id="verbatim_tag",
-    ),
-]
-
-
-@pytest.mark.parametrize(("source", "expected"), test_data)
-def test_base(source, expected, django_config):
-    output = formatter(django_config, source)
-
-    printer(expected, source, output)
-    assert expected == output

package/tests/test_django/test_with.py

@@ -1,32 +0,0 @@
-"""Test django with tag.
-
-poetry run pytest tests/test_django/test_with.py
-"""
-import pytest
-
-from src.djlint.reformat import formatter
-from tests.conftest import printer
-
-test_data = [
-    pytest.param(
-        (
-            "{% with total=business.employees.count %}{{ total }}<div>employee</div>{{ total|pluralize }}{% endwith %}"
-        ),
-        (
-            "{% with total=business.employees.count %}\n"
-            "    {{ total }}\n"
-            "    <div>employee</div>\n"
-            "    {{ total|pluralize }}\n"
-            "{% endwith %}\n"
-        ),
-        id="with_tag",
-    ),
-]
-
-
-@pytest.mark.parametrize(("source", "expected"), test_data)
-def test_base(source, expected, django_config):
-    output = formatter(django_config, source)
-
-    printer(expected, source, output)
-    assert expected == output

package/tests/test_djlint/-.html

@@ -1 +0,0 @@
-<div>

package/tests/test_djlint/bad.html

@@ -1,6 +0,0 @@
-My first name is {{ htmlfirst_name }}. My last name is {{ last_name }}.
-{% extends 'base_generic.html" %}
-{% block body %}{% endblock %}
-<link rel="stylesheet" href="/static/css/nav.scss" type="text/x-scss" charset="utf-8"/>
-<script type="text/javascript" src="/static/lib/markdown-it/markdown-it.js"></script>
-<img src="/static/images/hi.jpg" alt="Hi!">

package/tests/test_djlint/bad.html.dj

@@ -1,23 +0,0 @@
-{%this%}
-{{ is}}
-
-<a href="/junk"></a>
-
-<footer class="ft">
-    &copy; {% now "Y" %} - {{settings.ORG_NAME }}
-</footer>
-
-<BODY>
-<P>This is a paragraph.</P>
-
-
-<a HREF="https://www.w3schools.com/html/">Visit our HTML tutorial</a>
-
-<table class=striped></table>
-
-</BODY>
-
-<img src="html5.gif">
-<link rel = "stylesheet" href = "styles.css">
-
-<div class="this is a really line long of random stuff... how long can we make it? hopefully over 99 chars long!"><p>close that div out!</p></div>

package/tests/test_djlint/bad.html.dj2

@@ -1,2 +0,0 @@
-{{test }}
-{% test%}

package/tests/test_djlint/multiple_files/a/a.html

@@ -1 +0,0 @@
-{{fail}}

package/tests/test_djlint/multiple_files/b/b1.html

@@ -1 +0,0 @@
-{{fail}}

package/tests/test_djlint/multiple_files/b/b2.html

@@ -1 +0,0 @@
-{{fail}}

package/tests/test_djlint/test_djlint.py

@@ -1,242 +0,0 @@
-"""Djlint base tests.
-
-run::
-
-    pytest tests/test_djlint/test_djlint.py --cov=src/djlint --cov-branch --cov-report xml:coverage.xml --cov-report term-missing
-
-    pytest tests/test_djlint/test_djlint.py::test_hyphen_file
-
-or::
-
-    tox
-
-"""
-# pylint: disable=W1510
-import subprocess
-import sys
-
-try:
-    from importlib import metadata
-except ImportError:
-    # Running on pre-3.8 Python; use importlib-metadata package
-    import importlib_metadata as metadata  # type: ignore
-
-
-# pylint: disable=C0116
-from pathlib import Path
-from typing import TextIO
-
-from click.testing import CliRunner
-
-from src.djlint import main as djlint
-from tests.conftest import write_to_file
-
-
-def test_help(runner: CliRunner) -> None:
-    result = runner.invoke(djlint, ["-h"])
-    assert result.exit_code == 0
-    assert "djLint · HTML template linter and formatter." in result.output
-
-
-def test_bad_args(runner: CliRunner) -> None:
-    result = runner.invoke(djlint, ["-a"])
-    assert result.exit_code == 2
-    assert "Error: No such option: -a" in result.output
-
-    result = runner.invoke(djlint, ["--aasdf"])
-    assert result.exit_code == 2
-    assert "Error: No such option: --aasdf" in result.output
-
-
-def test_nonexisting_file(runner: CliRunner) -> None:
-    result = runner.invoke(djlint, ["not_a_file.html"])
-    assert result.exit_code == 2
-    assert "Path 'not_a_file.html' does not exist." in result.output
-
-
-def test_existing_file(runner: CliRunner) -> None:
-    result = runner.invoke(djlint, ["tests/test_djlint/bad.html"])
-    assert result.exit_code == 1
-    assert str(Path("tests/test_djlint/bad.html")) in result.output
-
-
-def test_hyphen_file(runner: CliRunner) -> None:
-    result = runner.invoke(djlint, ["tests/test_djlint/-.html"])
-    assert result.exit_code == 1
-    print(result.output)
-    assert str(Path("tests/test_djlint/-.html")) in result.output
-
-
-def test_multiple_files(runner: CliRunner) -> None:
-    result = runner.invoke(
-        djlint,
-        [
-            "tests/test_djlint/multiple_files/a",
-            "tests/test_djlint/multiple_files/b",
-            "--check",
-        ],
-    )
-    assert result.exit_code == 1
-    assert "3 files would be updated." in result.output
-
-
-def test_bad_path(runner: CliRunner) -> None:
-    result = runner.invoke(djlint, ["tests/nowhere"])
-    assert result.exit_code == 2
-    assert "does not exist." in result.output
-
-
-def test_good_path_with_e(runner: CliRunner) -> None:
-    result = runner.invoke(djlint, ["tests/test_djlint/", "-e", "html"])
-    assert result.exit_code == 1
-    assert str(Path("tests/test_djlint/bad.html")) in result.output
-
-
-def test_good_path_with_extension(runner: CliRunner) -> None:
-    result = runner.invoke(djlint, ["tests/test_djlint/", "--extension", "html*"])
-    assert result.exit_code == 1
-    assert str(Path("tests/test_djlint/bad.html")) in result.output
-    assert str(Path("tests/test_djlint/bad.html.dj")) in result.output
-
-
-def test_good_path_with_bad_ext(runner: CliRunner) -> None:
-    result = runner.invoke(djlint, ["tests/test_djlint/", "-e", "html.alphabet"])
-    assert result.exit_code == 0
-    assert "No files to check!" in result.output
-
-
-def test_empty_file(runner: CliRunner, tmp_file: TextIO) -> None:
-    write_to_file(tmp_file.name, b"")
-    result = runner.invoke(djlint, [tmp_file.name])
-    assert result.exit_code == 0
-
-
-def test_stdin(runner: CliRunner) -> None:
-    result = runner.invoke(djlint, ["-"], input='<div><p id="a"></p></div>')
-    assert result.exit_code == 0
-    assert "Linted 1 file" in result.output
-
-    # check with multiple inputs
-    result = runner.invoke(djlint, ["-", "-"], input='<div><p id="a"></p></div>')
-    assert result.exit_code == 0
-    assert "Linted 1 file" in result.output
-
-    # check with reformat
-    result = runner.invoke(djlint, ["-", "--reformat"], input="<div></div>")
-    assert result.output == "<div></div>\n"
-
-    # check with check
-    result = runner.invoke(djlint, ["-", "--check"], input="<div></div>")
-    assert result.output == "<div></div>\n"
-
-
-def test_stdin_non_ascii(runner: CliRunner) -> None:
-    result = runner.invoke(djlint, ["-", "--reformat"], input="必須")
-    assert result.output == "必須\n"
-
-    result = runner.invoke(djlint, ["-", "--reformat"], input="Вход")
-    assert result.output == "Вход\n"
-
-    result = runner.invoke(djlint, ["-", "--reformat"], input="çéâêîôûàèìòùëïü")
-    assert result.output == "çéâêîôûàèìòùëïü\n"
-
-    result = runner.invoke(djlint, ["-", "--reformat"], input="😀😂🤣😆🥰")
-    assert result.output == "😀😂🤣😆🥰\n"
-
-
-def test_check(runner: CliRunner, tmp_file: TextIO) -> None:
-    write_to_file(tmp_file.name, b"<div></div>")
-    result = runner.invoke(djlint, [tmp_file.name, "--check"])
-    assert result.exit_code == 0
-
-
-def test_check_non_existing_file(runner: CliRunner) -> None:
-    result = runner.invoke(djlint, ["tests/test_djlint/nothing.html", "--check"])
-    assert result.exit_code == 2
-
-
-def test_check_non_existing_folder(runner: CliRunner) -> None:
-    result = runner.invoke(djlint, ["tests/nothing", "--check"])
-    assert result.exit_code == 2
-
-
-def test_check_reformatter_simple_error(runner: CliRunner, tmp_file: TextIO) -> None:
-    write_to_file(tmp_file.name, b"<div><p>nice stuff here</p></div>")
-    result = runner.invoke(djlint, [tmp_file.name, "--check"])
-    assert result.exit_code == 1
-    assert "1 file would be updated." in result.output
-
-
-def test_reformatter_simple_error(runner: CliRunner, tmp_file: TextIO) -> None:
-    write_to_file(tmp_file.name, b"<div><p>nice stuff here</p></div>")
-    result = runner.invoke(djlint, [tmp_file.name, "--reformat"])
-    assert result.exit_code == 1
-    assert "1 file was updated." in result.output
-
-
-def test_check_reformatter_simple_error_quiet(
-    runner: CliRunner, tmp_file: TextIO
-) -> None:
-    write_to_file(tmp_file.name, b"<div><p>nice stuff here</p></div>")
-    result = runner.invoke(djlint, [tmp_file.name, "--check", "--quiet"])
-    assert result.exit_code == 1
-    assert "1 file would be updated." not in result.output
-
-
-def test_check_reformatter_no_error(runner: CliRunner, tmp_file: TextIO) -> None:
-    write_to_file(tmp_file.name, b"<div>\n    <p>nice stuff here</p>\n</div>")
-    result = runner.invoke(djlint, [tmp_file.name, "--check"])
-    assert result.exit_code == 0
-    assert "0 files would be updated." in result.output
-
-
-def test_warn(runner: CliRunner, tmp_file: TextIO) -> None:
-    write_to_file(
-        tmp_file.name, b"<div style='color:pink;'><p>nice stuff here</p></div>"
-    )
-    result = runner.invoke(djlint, [tmp_file.name, "--lint", "--warn"])
-    assert result.exit_code == 0
-
-
-def test_version(runner: CliRunner) -> None:
-    result = runner.invoke(djlint, ["--version"])
-    assert metadata.version("djlint") in result.output
-
-
-def test_python_call() -> None:
-    # give up fighting windows lol
-    if sys.platform != "win32":
-        py_sub = subprocess.run(
-            ["python", "-m", "djlint", "-h"],
-            stdout=subprocess.PIPE,
-            stderr=subprocess.PIPE,
-        )
-        print(py_sub.stdout)
-        print(py_sub.returncode)
-        assert b"python -m djlint [OPTIONS] SRC ..." in py_sub.stdout
-        assert py_sub.returncode == 0
-
-        py_sub = subprocess.run(
-            ["python", "-m", "djlint", "__init__", "-h"],
-            stdout=subprocess.PIPE,
-            stderr=subprocess.PIPE,
-        )
-        print(py_sub.stdout)
-        print(py_sub.returncode)
-        assert b"python -m djlint [OPTIONS] SRC ..." in py_sub.stdout
-        assert py_sub.returncode == 0
-
-
-def test_line_ending(runner: CliRunner, tmp_file: TextIO) -> None:
-    # write a windows line ending to file
-    text_in = "<div></div>\r\n"
-    with open(tmp_file.name, "w", encoding="utf8", newline="") as windows:
-        windows.write(text_in)
-
-    # make sure line ending was still there
-    assert Path(tmp_file.name).read_bytes().decode("utf8") == text_in
-
-    # check formatting
-    result = runner.invoke(djlint, [tmp_file.name, "--check", "--quiet"])
-
-    assert result.exit_code == 0

package/tests/test_golang/test_if.py

@@ -1,24 +0,0 @@
-"""Test golang if tag.
-
-poetry run pytest tests/test_golang/test_if.py
-"""
-import pytest
-
-from src.djlint.reformat import formatter
-from tests.conftest import printer
-
-test_data = [
-    pytest.param(
-        ("{{ if .condition }} {{ else }} {{ end }}"),
-        ("{{ if .condition }} {{ else }} {{ end }}\n"),
-        id="if_tag",
-    ),
-]
-
-
-@pytest.mark.parametrize(("source", "expected"), test_data)
-def test_base(source, expected, basic_config):
-    output = formatter(basic_config, source)
-
-    printer(expected, source, output)
-    assert expected == output

package/tests/test_golang/test_range.py

@@ -1,24 +0,0 @@
-"""Test golang range tag.
-
-poetry run pytest tests/test_golang/test_range.py
-"""
-import pytest
-
-from src.djlint.reformat import formatter
-from tests.conftest import printer
-
-test_data = [
-    pytest.param(
-        ("{{ range .Items }} {{ end }}"),
-        ("{{ range .Items }} {{ end }}\n"),
-        id="range_tag",
-    ),
-]
-
-
-@pytest.mark.parametrize(("source", "expected"), test_data)
-def test_base(source, expected, basic_config):
-    output = formatter(basic_config, source)
-
-    printer(expected, source, output)
-    assert expected == output

package/tests/test_handlebars/test_each.py

@@ -1,34 +0,0 @@
-"""Test handlebars each tag.
-
-poetry run pytest tests/test_handlebars/test_each.py
-"""
-import pytest
-
-from src.djlint.reformat import formatter
-from tests.conftest import printer
-
-test_data = [
-    pytest.param(
-        ("{{#each people}}{{print_person}} <p>and more long stuff</p>{{/each}}"),
-        (
-            "{{#each people }}\n"
-            "    {{print_person}}\n"
-            "    <p>and more long stuff</p>\n"
-            "{{/each}}\n"
-        ),
-        id="each_tag",
-    ),
-    pytest.param(
-        ('{{#each (cprFindConfigObj "inventoryCategories") as |category c | }}'),
-        ('{{#each (cprFindConfigObj "inventoryCategories") as |category c | }}\n'),
-        id="each_tag_with_pipe",
-    ),
-]
-
-
-@pytest.mark.parametrize(("source", "expected"), test_data)
-def test_base(source, expected, handlebars_config):
-    output = formatter(handlebars_config, source)
-
-    printer(expected, source, output)
-    assert expected == output

package/tests/test_handlebars/test_else.py

@@ -1,24 +0,0 @@
-"""Test handlebars else tag.
-
-poetry run pytest tests/test_handlebars/test_else.py
-"""
-import pytest
-
-from src.djlint.reformat import formatter
-from tests.conftest import printer
-
-test_data = [
-    pytest.param(
-        ("{{^}}"),
-        ("{{^}}\n"),
-        id="else_tag",
-    ),
-]
-
-
-@pytest.mark.parametrize(("source", "expected"), test_data)
-def test_base(source, expected, handlebars_config):
-    output = formatter(handlebars_config, source)
-
-    printer(expected, source, output)
-    assert expected == output

package/tests/test_handlebars/test_with.py

@@ -1,24 +0,0 @@
-"""Test handlebars with tag.
-
-poetry run pytest tests/test_handlebars/test_with.py
-"""
-import pytest
-
-from src.djlint.reformat import formatter
-from tests.conftest import printer
-
-test_data = [
-    pytest.param(
-        ("{{#with person}}<p>{{firstname}} {{lastname}}</p>{{/with}}"),
-        ("{{#with person}}\n" "    <p>{{firstname}} {{lastname}}</p>\n" "{{/with}}\n"),
-        id="with_tag",
-    ),
-]
-
-
-@pytest.mark.parametrize(("source", "expected"), test_data)
-def test_base(source, expected, handlebars_config):
-    output = formatter(handlebars_config, source)
-
-    printer(expected, source, output)
-    assert expected == output

package/tests/test_html/test_alpinejs.py

@@ -1,65 +0,0 @@
-"""Test for alpine.js.
-
-poetry run pytest tests/test_html/test_alpinejs.py
-"""
-import pytest
-
-from src.djlint.reformat import formatter
-from tests.conftest import printer
-
-test_data = [
-    pytest.param(
-        (
-            "<div\n"
-            '    id="collapse"\n'
-            '    x-data="{ show: true }"\n'
-            '    x-show="show"\n'
-            "    x-transition.duration.500ms\n"
-            '    :disabled="!$store.userPreferences.deleteConfirm"\n'
-            '    @click="clicked=true"\n'
-            "></div>\n"
-        ),
-        (
-            '<div id="collapse"\n'
-            '     x-data="{ show: true }"\n'
-            '     x-show="show"\n'
-            "     x-transition.duration.500ms\n"
-            '     :disabled="!$store.userPreferences.deleteConfirm"\n'
-            '     @click="clicked=true"></div>\n'
-        ),
-        id="alpine_js",
-    ),
-    pytest.param(
-        (
-            '<html lang="en">\n'
-            "    <body>\n"
-            "        <!-- x-data , x-text , x-html -->\n"
-            "        <div x-data=\"{key: ' value', message:'hello <b>world</b> '}\">\n"
-            '            <p x-text="key"></p>\n'
-            '            <p x-html="message"></p>\n'
-            "        </div>\n"
-            "    </body>\n"
-            "</html>\n\n"
-        ),
-        (
-            '<html lang="en">\n'
-            "    <body>\n"
-            "        <!-- x-data , x-text , x-html -->\n"
-            "        <div x-data=\"{key: ' value', message:'hello <b>world</b> '}\">\n"
-            '            <p x-text="key"></p>\n'
-            '            <p x-html="message"></p>\n'
-            "        </div>\n"
-            "    </body>\n"
-            "</html>\n"
-        ),
-        id="alpine_nested_html",
-    ),
-]
-
-
-@pytest.mark.parametrize(("source", "expected"), test_data)
-def test_base(source, expected, basic_config):
-    output = formatter(basic_config, source)
-
-    printer(expected, source, output)
-    assert expected == output