djlint 1.30.0 → 1.30.2

package/tests/test_config/test_close_void_tags.py

@@ -1,31 +0,0 @@
-"""Test for custom html.
-
-poetry run pytest tests/test_config/test_close_void_tags.py
-"""
-import pytest
-
-from src.djlint.reformat import formatter
-from tests.conftest import config_builder, printer
-
-test_data = [
-    pytest.param(
-        ("<img><meta>"),
-        ("<img>\n" "<meta>\n"),
-        ({}),
-        id="default",
-    ),
-    pytest.param(
-        ("<img><div><meta>"),
-        ("<img />\n" "<div>\n" "    <meta />\n"),
-        ({"close_void_tags": True}),
-        id="config",
-    ),
-]
-
-
-@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_config/test_custom_blocks.py

@@ -1,56 +0,0 @@
-"""Test for custom blocks.
-
---custom-blocks 'toc'
-
-poetry run pytest tests/test_config/test_custom_blocks.py
-"""
-import pytest
-
-from src.djlint.reformat import formatter
-from tests.conftest import config_builder, printer
-
-test_data = [
-    pytest.param(
-        (
-            "{% example stuff %}<p>this is a very very long paragraph that does nothing except be a long paragraph asdfasdfasdfasdfasdf fasdf asdfasdfasdf</p>{% endexample %}\n"
-            "\n"
-            "{% verylongexampletagthatiskindaneattolookat stuff%}{{ tag }}{% endverylongexampletagthatiskindaneattolookat %}"
-        ),
-        (
-            "{% example stuff %}\n"
-            "    <p>\n"
-            "        this is a very very long paragraph that does nothing except be a long paragraph asdfasdfasdfasdfasdf fasdf asdfasdfasdf\n"
-            "    </p>\n"
-            "{% endexample %}\n"
-            "{% verylongexampletagthatiskindaneattolookat stuff %}\n"
-            "    {{ tag }}\n"
-            "{% endverylongexampletagthatiskindaneattolookat %}\n"
-        ),
-        ({"custom_blocks": "toc,example,verylongexampletagthatiskindaneattolookat"}),
-        id="one",
-    ),
-    pytest.param(
-        (
-            "{% custom_block %}\n"
-            "    {% custom_block_but_different %}\n"
-            "    <p>some other content</p>\n"
-            "{% endcustom_block %}\n"
-        ),
-        (
-            "{% custom_block %}\n"
-            "    {% custom_block_but_different %}\n"
-            "    <p>some other content</p>\n"
-            "{% endcustom_block %}\n"
-        ),
-        ({"custom_blocks": "custom_block"}),
-        id="custom_block_with_similar_tag",
-    ),
-]
-
-
-@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_config/test_custom_html.py

@@ -1,45 +0,0 @@
-"""Test for custom html.
-
---custom-html 'dov'
-
-poetry run pytest tests/test_config/test_custom_html.py
-"""
-import pytest
-
-from src.djlint.reformat import formatter
-from tests.conftest import config_builder, printer
-
-test_data = [
-    pytest.param(
-        ("<mjml><mj-body>this is a email text</mj-body></mjml>"),
-        (
-            "<mjml>\n"
-            "    <mj-body>\n"
-            "        this is a email text\n"
-            "    </mj-body>\n"
-            "</mjml>\n"
-        ),
-        ({"custom_html": "mjml,mj-body"}),
-        id="with_flag",
-    ),
-    pytest.param(
-        ("<mjml><mj-body>this is a email text</mj-body></mjml>"),
-        ("<mjml><mj-body>this is a email text</mj-body></mjml>\n"),
-        (),
-        id="without_flag",
-    ),
-    pytest.param(
-        ("<some-long-custom-element></some-long-custom-element>"),
-        ("<some-long-custom-element></some-long-custom-element>\n"),
-        ({"custom_html": "mjml,mj-body"}),
-        id="other tag",
-    ),
-]
-
-
-@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_config/test_djlintrc/.djlintrc

@@ -1,38 +0,0 @@
-{
-   "blank_line_after_tag": "load,extends,include",
-   "blank_line_before_tag": "load,extends,include",
-   "custom_blocks": "toc,example",
-   "files": [
-        "index.html"
-    ],
-   "custom_html": "mjml,simple-greeting,mj-\\w+",
-   "exclude": ".venv,venv,.tox,.eggs,...",
-   "extend_exclude": ".custom",
-   "extension": "html.dj",
-   "format_attribute_template_tags": true,
-   "format_css": true,
-    "css": {
-        "indent_size": 5
-    },
-    "format_js": true,
-    "js": {
-        "indent_size": 5
-    },
-    "ignore": "H014,H015",
-    "ignore_blocks": "raw,example",
-    "ignore_case": true,
-    "include": "H014,H015",
-    "indent": "3",
-    "linter_output_format": "{filename}:{line}: {code} {message} {match}",
-    "max_attribute_length": "10",
-    "max_line_length": "120",
-    "per-file-ignores": {
-        "file.html": "H026,H025",
-        "file_two.html":"H001"
-    },
-    "preserve_blank_lines": true,
-    "preserve_leading_space": true,
-    "profile": "django",
-    "require_pragma": true,
-    "use_gitignore": true
-}

package/tests/test_config/test_djlintrc/test_config.py

@@ -1,44 +0,0 @@
-"""Test djlintrc config.
-
-poetry run pytest tests/test_config/test_djlintrc
-
-"""
-from pathlib import Path
-
-from src.djlint.settings import Config
-
-
-def test_default() -> None:
-    config = Config(str(Path(__file__).parent / "blank.html"))
-
-    assert config.exclude == ".venv,venv,.tox,.eggs,... | .custom"
-    assert config.blank_line_after_tag == "load,extends,include"
-    assert config.blank_line_before_tag == "load,extends,include"
-    assert config.custom_blocks == r"|endexample\b|endtoc\b|example\b|toc\b"
-    assert config.custom_html == r"|mjml|simple-greeting|mj-\w+"
-    assert config.extension == "html.dj"
-    assert config.files == ["index.html"]
-    assert config.format_attribute_template_tags is True
-    assert config.format_css is True
-    assert config.format_js is True
-    assert config.ignore == "H014,H015"
-    assert config.ignore_blocks == r"endexample\b|endraw\b|example\b|raw\b"
-    assert config.ignore_case is True
-    assert config.include == "H014,H015"
-    assert config.indent == 3 * " "
-    assert config.linter_output_format == "{filename}:{line}: {code} {message} {match}"
-    assert config.max_attribute_length == 10
-    assert config.max_line_length == 120
-    assert config.preserve_blank_lines is True
-    assert config.preserve_leading_space is True
-    assert config.profile == "django"
-    assert config.require_pragma is True
-    assert config.use_gitignore is True
-
-    assert config.js_config == {"indent_size": 5}
-    assert config.css_config == {"indent_size": 5}
-
-    assert config.per_file_ignores == {
-        "file.html": "H026,H025",
-        "file_two.html": "H001",
-    }

package/tests/test_config/test_djlintrc_custom/.djlint-cust

@@ -1,38 +0,0 @@
-{
-   "blank_line_after_tag": "load,extends,include",
-   "blank_line_before_tag": "load,extends,include",
-   "custom_blocks": "toc,example",
-   "files": [
-        "index.html"
-    ],
-   "custom_html": "mjml,simple-greeting,mj-\\w+",
-   "exclude": ".venv,venv,.tox,.egg,...",
-   "extend_exclude": ".customs",
-   "extension": "html.dj",
-   "format_attribute_template_tags": true,
-   "format_css": true,
-    "css": {
-        "indent_size": 4
-    },
-    "format_js": true,
-    "js": {
-        "indent_size": 4
-    },
-    "ignore": "H014,H015",
-    "ignore_blocks": "raw,example",
-    "ignore_case": true,
-    "include": "H014,H015",
-    "indent": "4",
-    "linter_output_format": "{filename}:{line}: {code} {message} {match}",
-    "max_attribute_length": "10",
-    "max_line_length": "120",
-    "per-file-ignores": {
-        "file.html": "H026,H025",
-        "file_two.html":"H001"
-    },
-    "preserve_blank_lines": true,
-    "preserve_leading_space": true,
-    "profile": "django",
-    "require_pragma": true,
-    "use_gitignore": true
-}

package/tests/test_config/test_djlintrc_custom/.djlintrc

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

package/tests/test_config/test_djlintrc_custom/test_config.py

@@ -1,48 +0,0 @@
-"""Test djlintrc custom config.
-
-poetry run pytest tests/test_config/test_djlintrc_custom
-
-"""
-from pathlib import Path
-
-from src.djlint.settings import Config
-
-
-def test_custom() -> None:
-    config = Config(
-        str(Path(__file__).parent / "blank.html"),
-        configuration=str(Path(__file__).parent / ".djlint-cust"),
-    )
-
-    print(config.exclude)
-    assert config.exclude == ".venv,venv,.tox,.egg,... | .customs"
-    assert config.blank_line_after_tag == "load,extends,include"
-    assert config.blank_line_before_tag == "load,extends,include"
-    assert config.custom_blocks == r"|endexample\b|endtoc\b|example\b|toc\b"
-    assert config.custom_html == r"|mjml|simple-greeting|mj-\w+"
-    assert config.extension == "html.dj"
-    assert config.files == ["index.html"]
-    assert config.format_attribute_template_tags is True
-    assert config.format_css is True
-    assert config.format_js is True
-    assert config.ignore == "H014,H015"
-    assert config.ignore_blocks == r"endexample\b|endraw\b|example\b|raw\b"
-    assert config.ignore_case is True
-    assert config.include == "H014,H015"
-    assert config.indent == 4 * " "
-    assert config.linter_output_format == "{filename}:{line}: {code} {message} {match}"
-    assert config.max_attribute_length == 10
-    assert config.max_line_length == 120
-    assert config.preserve_blank_lines is True
-    assert config.preserve_leading_space is True
-    assert config.profile == "django"
-    assert config.require_pragma is True
-    assert config.use_gitignore is True
-
-    assert config.js_config == {"indent_size": 4}
-    assert config.css_config == {"indent_size": 4}
-
-    assert config.per_file_ignores == {
-        "file.html": "H026,H025",
-        "file_two.html": "H001",
-    }

package/tests/test_config/test_excludes/excluded.html

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

package/tests/test_config/test_excludes/foo/excluded.html

@@ -1 +0,0 @@
-<h1>bad</h2>

package/tests/test_config/test_excludes/html.html

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

package/tests/test_config/test_excludes/pyproject.toml

@@ -1,3 +0,0 @@
-[tool.djlint]
-exclude = "foo/excluded.html"
-extend_exclude = "excluded.html"

package/tests/test_config/test_excludes/test_config.py

@@ -1,30 +0,0 @@
-"""Djlint tests specific to pyproject.toml configuration.
-
-run::
-
-   pytest tests/test_config.py --cov=src/djlint --cov-branch \
-          --cov-report xml:coverage.xml --cov-report term-missing
-
-for a single test, run::
-
-   pytest tests/test_config.py::test_custom_html --cov=src/djlint \
-     --cov-branch --cov-report xml:coverage.xml --cov-report term-missing
-
-"""
-# pylint: disable=C0116
-
-
-from click.testing import CliRunner
-
-from src.djlint import main as djlint
-
-
-def test_exclude(runner: CliRunner) -> None:
-    result = runner.invoke(
-        djlint, ["tests/test_config/test_excludes", "--profile", "django"]
-    )
-    print(result.output)
-    assert """html.html""" in result.output
-    assert """excluded.html""" not in result.output
-    assert """foo/excluded.html""" not in result.output
-    assert result.exit_code == 1

package/tests/test_config/test_extension/html.test

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

package/tests/test_config/test_extension/pyproject.toml

@@ -1,3 +0,0 @@
-[tool]
-[tool.djlint]
-extension = "test"

package/tests/test_config/test_extension/test_config.py

@@ -1,27 +0,0 @@
-"""Djlint tests specific to pyproject.toml configuration.
-
-run::
-
-   pytest tests/test_config.py --cov=src/djlint --cov-branch \
-          --cov-report xml:coverage.xml --cov-report term-missing
-
-for a single test, run::
-
-   pytest tests/test_config.py::test_custom_html --cov=src/djlint \
-     --cov-branch --cov-report xml:coverage.xml --cov-report term-missing
-
-"""
-# pylint: disable=C0116
-
-
-from click.testing import CliRunner
-
-from src.djlint import main as djlint
-
-
-def test_extension(runner: CliRunner) -> None:
-    result = runner.invoke(djlint, ["tests/test_config/test_extension", "--check"])
-    assert """Checking""" in result.output
-    assert """1/1""" in result.output
-    assert """0 files would be updated.""" in result.output
-    assert result.exit_code == 0

package/tests/test_config/test_files/.djlintrc_global

@@ -1,9 +0,0 @@
-{
-    "profile": "django",
-    "indent": 2,
-    "ignore": "",
-    "files": [
-        "./tests/test_config/test_files/test.html",
-        "./tests/test_config/test_files/test_two.html"
-    ]
-}

package/tests/test_config/test_files/test.html

@@ -1,3 +0,0 @@
-<div>
-  <p></p>
-</div>

package/tests/test_config/test_files/test_config.py

@@ -1,123 +0,0 @@
-"""Djlint tests specific to custom file path.
-
-run::
-
-   pytest tests/test_config/test_files/test_config.py --cov=src/djlint --cov-branch \
-          --cov-report xml:coverage.xml --cov-report term-missing
-
-   pytest tests/test_config/test_files/test_config.py::test_global_override
-
-"""
-# pylint: disable=C0116
-
-import os
-
-from click.testing import CliRunner
-
-from src.djlint import main as djlint
-
-
-def test_check_custom_file_src(runner: CliRunner) -> None:
-    result = runner.invoke(
-        djlint,
-        [
-            "-",
-            "--check",
-            "--configuration",
-            "tests/test_config/test_files/.djlintrc_global",
-        ],
-    )
-    assert """Checking 2/2 files""" in result.output
-
-
-def test_lint_custom_file_src(runner: CliRunner) -> None:
-    result = runner.invoke(
-        djlint,
-        [
-            "-",
-            "--lint",
-            "--configuration",
-            "tests/test_config/test_files/.djlintrc_global",
-        ],
-    )
-    assert """Linting 2/2 files""" in result.output
-
-
-def test_reformat_custom_file_src(runner: CliRunner) -> None:
-    result = runner.invoke(
-        djlint,
-        [
-            "-",
-            "--reformat",
-            "--configuration",
-            "tests/test_config/test_files/.djlintrc_global",
-        ],
-    )
-    assert """Reformatting 2/2 files""" in result.output
-
-
-def test_global_override(runner: CliRunner) -> None:
-    result = runner.invoke(
-        djlint,
-        [
-            "-",
-            "--lint",
-            "--configuration",
-            "tests/test_config/test_files/.djlintrc_global",
-        ],
-    )
-    # fails
-    assert result.exit_code == 1
-
-    # check cli override
-    result = runner.invoke(
-        djlint,
-        [
-            "-",
-            "--lint",
-            "--configuration",
-            "tests/test_config/test_files/.djlintrc_global",
-            "--ignore",
-            "H025,H020",
-        ],
-    )
-    # passes
-    assert result.exit_code == 0
-
-    # check project settings override
-
-    # create project settings folder
-    # add a gitignore file
-    with open(
-        "tests/test_config/test_files/.djlintrc", "w", encoding="utf8"
-    ) as local_settings:
-        local_settings.write('{ "ignore":"H025"}')
-
-    result = runner.invoke(
-        djlint,
-        [
-            "tests/test_config/test_files/test_two.html",
-            "--lint",
-            "--configuration",
-            "tests/test_config/test_files/.djlintrc_global",
-        ],
-    )
-
-    result_two = runner.invoke(
-        djlint,
-        [
-            "tests/test_config/test_files/test.html",
-            "--lint",
-            "--configuration",
-            "tests/test_config/test_files/.djlintrc_global",
-        ],
-    )
-    try:
-        os.remove("tests/test_config/test_files/.djlintrc")
-    except BaseException as e:
-        print("cleanup failed")
-        print(e)
-
-    # H025 should be ignored, but H022 not
-    assert "H025" not in result.output
-    assert "H020" in result_two.output

package/tests/test_config/test_files/test_two.html

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