\n" - "
\n" "
\n" - "
\n" - "
\n" "
\n\n
\n\n\n" - ' Foo\n' - "
\n" - "{% endspaceless %}\n" - ), + ("{% spaceless %}\n" "\n" ' Foo\n' "
\n" "{% endspaceless %}\n"), id="spaceless_tag", - ), + ) ] @pytest.mark.parametrize(("source", "expected"), test_data) -def test_base(source, expected, django_config): +def test_base(source: str, expected: str, django_config: Config) -> None: output = formatter(django_config, source) printer(expected, source, output) diff --git a/tests/test_django/test_tag_spaces.py b/tests/test_django/test_tag_spaces.py index 095129d31..26e28c2b7 100644 --- a/tests/test_django/test_tag_spaces.py +++ b/tests/test_django/test_tag_spaces.py @@ -2,19 +2,23 @@ poetry run pytest tests/test_django/test_tag_spaces.py """ + +from __future__ import annotations + +from typing import TYPE_CHECKING + import pytest -from src.djlint.reformat import formatter +from djlint.reformat import formatter from tests.conftest import config_builder, printer +if TYPE_CHECKING: + from typing_extensions import Any + 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" - ), + ("{% a %}\n" "{% b %}{%+ c %}{%- d +%}\n" "{#a}{{ g {% a % }}}{% l{{ q }} +%}\n"), ({}), id="messy stuff", ), @@ -28,7 +32,7 @@ @pytest.mark.parametrize(("source", "expected", "args"), test_data) -def test_base(source, expected, args): +def test_base(source: str, expected: str, args: dict[str, Any]) -> None: output = formatter(config_builder(args), source) printer(expected, source, output) diff --git a/tests/test_django/test_templatetag.py b/tests/test_django/test_templatetag.py index c44bdd658..4f91c4b66 100644 --- a/tests/test_django/test_templatetag.py +++ b/tests/test_django/test_templatetag.py @@ -2,38 +2,36 @@ poetry run pytest tests/test_django/test_templatetag.py """ + +from __future__ import annotations + +from typing import TYPE_CHECKING + import pytest -from src.djlint.reformat import formatter +from djlint.reformat import formatter from tests.conftest import printer +if TYPE_CHECKING: + from djlint.settings import Config + test_data = [ - pytest.param( - ("{% if stuff %}\n{% endif %}"), - ("{% if stuff %}{% endif %}\n"), - id="tags_on_one_line", - ), + 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" - ), + ("{% 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): +def test_base(source: str, expected: str, django_config: Config) -> None: output = formatter(django_config, source) printer(expected, source, output) diff --git a/tests/test_django/test_thumbnail.py b/tests/test_django/test_thumbnail.py index 571826790..b07312dcc 100644 --- a/tests/test_django/test_thumbnail.py +++ b/tests/test_django/test_thumbnail.py @@ -4,11 +4,19 @@ poetry run pytest tests/test_django/test_thumbnail.py """ + +from __future__ import annotations + +from typing import TYPE_CHECKING + import pytest -from src.djlint.reformat import formatter +from djlint.reformat import formatter from tests.conftest import printer +if TYPE_CHECKING: + from djlint.settings import Config + test_data = [ pytest.param( ( @@ -30,12 +38,12 @@ "{% endthumbnail %}\n" ), id="thumbnail", - ), + ) ] @pytest.mark.parametrize(("source", "expected"), test_data) -def test_base(source, expected, django_config): +def test_base(source: str, expected: str, django_config: Config) -> None: output = formatter(django_config, source) printer(expected, source, output) diff --git a/tests/test_django/test_verbatim.py b/tests/test_django/test_verbatim.py index 34703a271..ba0d0586b 100644 --- a/tests/test_django/test_verbatim.py +++ b/tests/test_django/test_verbatim.py @@ -2,22 +2,28 @@ poetry run pytest tests/test_django/test_verbatim.py """ + +from __future__ import annotations + +from typing import TYPE_CHECKING + import pytest -from src.djlint.reformat import formatter +from djlint.reformat import formatter from tests.conftest import printer +if TYPE_CHECKING: + from djlint.settings import Config + test_data = [ pytest.param( - ("{% verbatim %}Still alive.{% endverbatim %}"), - ("{% verbatim %}\n" " Still alive.\n" "{% endverbatim %}\n"), - id="verbatim_tag", - ), + ("{% 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): +def test_base(source: str, expected: str, django_config: Config) -> None: output = formatter(django_config, source) printer(expected, source, output) diff --git a/tests/test_django/test_with.py b/tests/test_django/test_with.py index 655a3aa9d..4d40ddaf3 100644 --- a/tests/test_django/test_with.py +++ b/tests/test_django/test_with.py @@ -2,16 +2,22 @@ poetry run pytest tests/test_django/test_with.py """ + +from __future__ import annotations + +from typing import TYPE_CHECKING + import pytest -from src.djlint.reformat import formatter +from djlint.reformat import formatter from tests.conftest import printer +if TYPE_CHECKING: + from djlint.settings import Config + test_data = [ pytest.param( - ( - "{% with total=business.employees.count %}{{ total }}nice stuff here
nice stuff here
nice stuff here
\nnice stuff here
nice stuff here
\nnice stuff here
nice stuff here
and more long stuff
{{/each}}"), - ( - "{{#each people }}\n" - " {{print_person}}\n" - "and more long stuff
\n" - "{{/each}}\n" - ), + ("{{#each people }}\n" " {{print_person}}\n" "and more long stuff
\n" "{{/each}}\n"), id="each_tag", ), pytest.param( @@ -27,7 +30,7 @@ @pytest.mark.parametrize(("source", "expected"), test_data) -def test_base(source, expected, handlebars_config): +def test_base(source: str, expected: str, handlebars_config: Config) -> None: output = formatter(handlebars_config, source) printer(expected, source, output) diff --git a/tests/test_handlebars/test_else.py b/tests/test_handlebars/test_else.py index b791e582e..d59f6639c 100644 --- a/tests/test_handlebars/test_else.py +++ b/tests/test_handlebars/test_else.py @@ -2,22 +2,24 @@ poetry run pytest tests/test_handlebars/test_else.py """ + +from __future__ import annotations + +from typing import TYPE_CHECKING + import pytest -from src.djlint.reformat import formatter +from djlint.reformat import formatter from tests.conftest import printer -test_data = [ - pytest.param( - ("{{^}}"), - ("{{^}}\n"), - id="else_tag", - ), -] +if TYPE_CHECKING: + from djlint.settings import Config + +test_data = [pytest.param(("{{^}}"), ("{{^}}\n"), id="else_tag")] @pytest.mark.parametrize(("source", "expected"), test_data) -def test_base(source, expected, handlebars_config): +def test_base(source: str, expected: str, handlebars_config: Config) -> None: output = formatter(handlebars_config, source) printer(expected, source, output) diff --git a/tests/test_handlebars/test_with.py b/tests/test_handlebars/test_with.py index 74a1ac5cb..c7278f175 100644 --- a/tests/test_handlebars/test_with.py +++ b/tests/test_handlebars/test_with.py @@ -2,22 +2,30 @@ poetry run pytest tests/test_handlebars/test_with.py """ + +from __future__ import annotations + +from typing import TYPE_CHECKING + import pytest -from src.djlint.reformat import formatter +from djlint.reformat import formatter from tests.conftest import printer +if TYPE_CHECKING: + from djlint.settings import Config + test_data = [ pytest.param( ("{{#with person}}{{firstname}} {{lastname}}
{{/with}}"), ("{{#with person}}\n" "{{firstname}} {{lastname}}
\n" "{{/with}}\n"), id="with_tag", - ), + ) ] @pytest.mark.parametrize(("source", "expected"), test_data) -def test_base(source, expected, handlebars_config): +def test_base(source: str, expected: str, handlebars_config: Config) -> None: output = formatter(handlebars_config, source) printer(expected, source, output) diff --git a/tests/test_html/test_alpinejs.py b/tests/test_html/test_alpinejs.py index 8defc3811..c9e6c018f 100644 --- a/tests/test_html/test_alpinejs.py +++ b/tests/test_html/test_alpinejs.py @@ -2,11 +2,19 @@ poetry run pytest tests/test_html/test_alpinejs.py """ + +from __future__ import annotations + +from typing import TYPE_CHECKING + import pytest -from src.djlint.reformat import formatter +from djlint.reformat import formatter from tests.conftest import printer +if TYPE_CHECKING: + from djlint.settings import Config + test_data = [ pytest.param( ( @@ -58,7 +66,7 @@ @pytest.mark.parametrize(("source", "expected"), test_data) -def test_base(source, expected, basic_config): +def test_base(source: str, expected: str, basic_config: Config) -> None: output = formatter(basic_config, source) printer(expected, source, output) diff --git a/tests/test_html/test_attributes.py b/tests/test_html/test_attributes.py index 8730d630d..8c4f28c05 100644 --- a/tests/test_html/test_attributes.py +++ b/tests/test_html/test_attributes.py @@ -2,11 +2,19 @@ poetry run pytest tests/test_html/test_attributes.py """ + +from __future__ import annotations + +from typing import TYPE_CHECKING + import pytest -from src.djlint.reformat import formatter +from djlint.reformat import formatter from tests.conftest import printer +if TYPE_CHECKING: + from djlint.settings import Config + test_data = [ pytest.param( ( @@ -118,12 +126,8 @@ # https://github.com/djlint/djLint/issues/317 # https://github.com/djlint/djLint/issues/330 pytest.param( - ( - 'Test\n' - ), - ( - 'Test\n' - ), + ('Test\n'), + ('Test\n'), id="space_around_equals", ), pytest.param( @@ -146,17 +150,8 @@ id="ignored_attributes", ), pytest.param( - ( - "
\n'),
- ('\n'),
- id="double_quotes",
- ),
- pytest.param(
- ('123'),
- ('123\n'),
- id="duplicate",
+ ('\n'), ('\n'), id="double_quotes"
),
+ pytest.param(('123'), ('123\n'), id="duplicate"),
pytest.param(
- (''),
- ('\n'),
- id="single_quotes",
+ (''), ('\n'), id="single_quotes"
),
pytest.param(
- (
- "String
"), - ("String
\n"), - id="without_quotes", - ), + pytest.param(("String
"), ("String
\n"), id="without_quotes"), ] @pytest.mark.parametrize(("source", "expected"), test_data) -def test_base(source, expected, basic_config): +def test_base(source: str, expected: str, basic_config: Config) -> None: output = formatter(basic_config, source) printer(expected, source, output) diff --git a/tests/test_html/test_aurelia.py b/tests/test_html/test_aurelia.py index 70a97c601..2531fb0ad 100644 --- a/tests/test_html/test_aurelia.py +++ b/tests/test_html/test_aurelia.py @@ -2,22 +2,30 @@ poetry run pytest tests/test_html/test_aurelia.py """ + +from __future__ import annotations + +from typing import TYPE_CHECKING + import pytest -from src.djlint.reformat import formatter +from djlint.reformat import formatter from tests.conftest import printer +if TYPE_CHECKING: + from djlint.settings import Config + test_data = [ pytest.param( ("\n" ' \n' "\n"), ("\n" ' \n' "\n"), id="aurelia", - ), + ) ] @pytest.mark.parametrize(("source", "expected"), test_data) -def test_base(source, expected, basic_config): +def test_base(source: str, expected: str, basic_config: Config) -> None: output = formatter(basic_config, source) printer(expected, source, output) diff --git a/tests/test_html/test_basics.py b/tests/test_html/test_basics.py index 88d1a667e..a2e34fc3f 100644 --- a/tests/test_html/test_basics.py +++ b/tests/test_html/test_basics.py @@ -2,11 +2,19 @@ poetry run pytest tests/test_html/test_basics.py """ + +from __future__ import annotations + +from typing import TYPE_CHECKING + import pytest -from src.djlint.reformat import formatter +from djlint.reformat import formatter from tests.conftest import printer +if TYPE_CHECKING: + from djlint.settings import Config + test_data = [ pytest.param( ( @@ -38,21 +46,9 @@ ), pytest.param("", "\n", id="comment"), pytest.param( - ( - "\n" - "\n" - "\n" - "\n" - "\n" - ), - ( - "\n" - "\n" - " \n" - " \n" - "\n" - ), - id="emtpy_doc", + ("\n" "\n" "\n" "\n" "\n"), + ("\n" "\n" " \n" " \n" "\n"), + id="empty_doc", ), pytest.param("", "", id="empty"), pytest.param( @@ -354,21 +350,13 @@ ), id="html5_boilerplate", ), - pytest.param( - "a-b-", - "a-b-\n", - id="issue_9368_2", - ), + pytest.param("a-b-", "a-b-\n", id="issue_9368_2"), pytest.param( "a trackpad, or a gyroscope.", "a trackpad, or a gyroscope.\n", id="issue_9368_3", ), - pytest.param( - "a->b->", - "a->b->\n", - id="issue_9368", - ), + pytest.param("a->b->", "a->b->\n", id="issue_9368"), pytest.param( ( "\n" @@ -898,7 +886,7 @@ @pytest.mark.parametrize(("source", "expected"), test_data) -def test_base(source, expected, basic_config): +def test_base(source: str, expected: str, basic_config: Config) -> None: output = formatter(basic_config, source) printer(expected, source, output) diff --git a/tests/test_html/test_bracket_same_line.py b/tests/test_html/test_bracket_same_line.py index 3462f9d23..eddd959ba 100644 --- a/tests/test_html/test_bracket_same_line.py +++ b/tests/test_html/test_bracket_same_line.py @@ -2,11 +2,19 @@ poetry run pytest tests/test_html/test_bracket_same_line.py """ + +from __future__ import annotations + +from typing import TYPE_CHECKING + import pytest -from src.djlint.reformat import formatter +from djlint.reformat import formatter from tests.conftest import printer +if TYPE_CHECKING: + from djlint.settings import Config + test_data = [ pytest.param( ( @@ -164,13 +172,13 @@ '
\n'
'\n'
),
- id="void_braket_same_line",
+ id="void_bracket_same_line",
),
]
@pytest.mark.parametrize(("source", "expected"), test_data)
-def test_base(source, expected, basic_config):
+def test_base(source: str, expected: str, basic_config: Config) -> None:
output = formatter(basic_config, source)
printer(expected, source, output)
diff --git a/tests/test_html/test_case.py b/tests/test_html/test_case.py
index 1b88fb02e..3be770896 100644
--- a/tests/test_html/test_case.py
+++ b/tests/test_html/test_case.py
@@ -2,10 +2,13 @@
poetry run pytest tests/test_html/test_case.py
"""
+
+from __future__ import annotations
+
import pytest
-from src.djlint.reformat import formatter
-from src.djlint.settings import Config
+from djlint.reformat import formatter
+from djlint.settings import Config
from tests.conftest import printer
test_data = [
@@ -56,7 +59,7 @@
@pytest.mark.parametrize(("source", "expected"), test_data)
-def test_base(source, expected, basic_config):
+def test_base(source: str, expected: str, basic_config: Config) -> None:
output = formatter(basic_config, source)
printer(expected, source, output)
@@ -73,7 +76,7 @@ def test_base(source, expected, basic_config):
@pytest.mark.parametrize(("source", "expected"), test_data_two)
-def test_base_two(source, expected):
+def test_base_two(source: str, expected: str) -> None:
config = Config("dummy/source.html", ignore_case=True)
output = formatter(config, source)
diff --git a/tests/test_html/test_cdata.py b/tests/test_html/test_cdata.py
index 6966c49f8..c4d1286d8 100644
--- a/tests/test_html/test_cdata.py
+++ b/tests/test_html/test_cdata.py
@@ -2,11 +2,19 @@
poetry run pytest tests/test_html/test_cdata.py
"""
+
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
import pytest
-from src.djlint.reformat import formatter
+from djlint.reformat import formatter
from tests.conftest import printer
+if TYPE_CHECKING:
+ from djlint.settings import Config
+
test_data = [
pytest.param(
(
@@ -22,12 +30,12 @@
"\n"
),
id="cdata",
- ),
+ )
]
@pytest.mark.parametrize(("source", "expected"), test_data)
-def test_base(source, expected, basic_config):
+def test_base(source: str, expected: str, basic_config: Config) -> None:
output = formatter(basic_config, source)
printer(expected, source, output)
diff --git a/tests/test_html/test_comments.py b/tests/test_html/test_comments.py
index 0b51e8060..e25ef84b9 100644
--- a/tests/test_html/test_comments.py
+++ b/tests/test_html/test_comments.py
@@ -2,34 +2,27 @@
poetry run pytest tests/test_html/test_comments.py
"""
+
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
import pytest
-from src.djlint.reformat import formatter
+from djlint.reformat import formatter
from tests.conftest import printer
+if TYPE_CHECKING:
+ from djlint.settings import Config
+
test_data = [
pytest.param(
("Hello
Hello
\n" " Hello\n" @@ -27,9 +33,7 @@ id="self_closing", ), pytest.param( - ( - "
Hello
Hello
\n"
" Hello\n"
@@ -48,7 +52,7 @@
@pytest.mark.parametrize(("source", "expected"), test_data)
-def test_base(source, expected, basic_config):
+def test_base(source: str, expected: str, basic_config: Config) -> None:
output = formatter(basic_config, source)
printer(expected, source, output)
diff --git a/tests/test_html/test_single_attribute_per_line.py b/tests/test_html/test_single_attribute_per_line.py
index 473efefd4..7a60d28f3 100644
--- a/tests/test_html/test_single_attribute_per_line.py
+++ b/tests/test_html/test_single_attribute_per_line.py
@@ -2,11 +2,19 @@
poetry run pytest tests/test_html/test_single_attribute_per_line.py
"""
+
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
import pytest
-from src.djlint.reformat import formatter
+from djlint.reformat import formatter
from tests.conftest import printer
+if TYPE_CHECKING:
+ from djlint.settings import Config
+
test_data = [
pytest.param(
(
@@ -80,7 +88,7 @@
@pytest.mark.parametrize(("source", "expected"), test_data)
-def test_base(source, expected, basic_config):
+def test_base(source: str, expected: str, basic_config: Config) -> None:
output = formatter(basic_config, source)
printer(expected, source, output)
diff --git a/tests/test_html/test_srcset.py b/tests/test_html/test_srcset.py
index fead129c8..9ff006d49 100644
--- a/tests/test_html/test_srcset.py
+++ b/tests/test_html/test_srcset.py
@@ -2,11 +2,19 @@
poetry run pytest tests/test_html/test_srcset.py
"""
+
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
import pytest
-from src.djlint.reformat import formatter
+from djlint.reformat import formatter
from tests.conftest import printer
+if TYPE_CHECKING:
+ from djlint.settings import Config
+
test_data = [
pytest.param(
(
@@ -31,12 +39,12 @@
' alt="" />\n'
),
id="invalid",
- ),
+ )
]
@pytest.mark.parametrize(("source", "expected"), test_data)
-def test_base(source, expected, basic_config):
+def test_base(source: str, expected: str, basic_config: Config) -> None:
output = formatter(basic_config, source)
printer(expected, source, output)
diff --git a/tests/test_html/test_svg.py b/tests/test_html/test_svg.py
index 6e45a61ba..bcf368909 100644
--- a/tests/test_html/test_svg.py
+++ b/tests/test_html/test_svg.py
@@ -2,11 +2,19 @@
poetry run pytest tests/test_html/test_svg.py
"""
+
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
import pytest
-from src.djlint.reformat import formatter
+from djlint.reformat import formatter
from tests.conftest import printer
+if TYPE_CHECKING:
+ from djlint.settings import Config
+
test_data = [
pytest.param(
(
@@ -38,7 +46,7 @@
" \n"
' \n"
@@ -82,7 +90,7 @@
" \n"
' 123 I will display € I will display ! I will display € I will display € I will display € I will display ! I will display € I will display € I will display € I will display ! I will display € I will display € I will display € I will display ! I will display € I will display € asdf \n"
- " \n"
- " asdf\n"
- " \n" " \n" " asdf\n" " Text text \n"
- " Text text\n"
- " \n" " Text text\n" " \n"
- ' New You can now use this feature\n'
- " \n"
- ' New You can now use this feature\n'
- " \n" ' New You can now use this feature\n' " \n" ' New You can now use this feature\n' " X or Y X or Y \n"
- " X or Y\n"
- " X or Y \n" " X or Y\n" " X or Y\n'
" \n"
),
- (
- "\n'
" \n"
"\n" "
\n"),
("a b\n" " \n" "
\n"),
id="code_tag",
- ),
+ )
]
@pytest.mark.parametrize(("source", "expected"), test_data)
-def test_base(source, expected, basic_config):
+def test_base(source: str, expected: str, basic_config: Config) -> None:
output = formatter(basic_config, source)
printer(expected, source, output)
diff --git a/tests/test_html/test_tag_dd.py b/tests/test_html/test_tag_dd.py
index 77fc10053..1f9f63f33 100644
--- a/tests/test_html/test_tag_dd.py
+++ b/tests/test_html/test_tag_dd.py
@@ -2,22 +2,24 @@
poetry run pytest tests/test_html/test_tag_dd.py
"""
+
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
import pytest
-from src.djlint.reformat import formatter
+from djlint.reformat import formatter
from tests.conftest import printer
-test_data = [
- pytest.param(
- ("a b\n" " "),
("summary
body\n" " \n"),
id="details_summary_tags",
- ),
+ )
]
@pytest.mark.parametrize(("source", "expected"), test_data)
-def test_base(source, expected, basic_config):
+def test_base(source: str, expected: str, basic_config: Config) -> None:
output = formatter(basic_config, source)
printer(expected, source, output)
diff --git a/tests/test_html/test_tag_dt.py b/tests/test_html/test_tag_dt.py
index 9642f189f..a246fc8eb 100644
--- a/tests/test_html/test_tag_dt.py
+++ b/tests/test_html/test_tag_dt.py
@@ -2,22 +2,24 @@
poetry run pytest tests/test_html/test_tag_dt.py
"""
+
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
import pytest
-from src.djlint.reformat import formatter
+from djlint.reformat import formatter
from tests.conftest import printer
-test_data = [
- pytest.param(
- "summary
\n" " body\n" "\n'
- "
\n' "
\n" " \n"),
@@ -22,7 +30,7 @@
@pytest.mark.parametrize(("source", "expected"), test_data)
-def test_base(source, expected, basic_config):
+def test_base(source: str, expected: str, basic_config: Config) -> None:
output = formatter(basic_config, source)
printer(expected, source, output)
diff --git a/tests/test_html/test_tag_picture.py b/tests/test_html/test_tag_picture.py
index 8ba7dc04c..505a4fbd5 100644
--- a/tests/test_html/test_tag_picture.py
+++ b/tests/test_html/test_tag_picture.py
@@ -2,30 +2,30 @@
poetry run pytest tests/test_html/test_tag_picture.py
"""
+
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
import pytest
-from src.djlint.reformat import formatter
+from djlint.reformat import formatter
from tests.conftest import printer
+if TYPE_CHECKING:
+ from djlint.settings import Config
+
test_data = [
pytest.param(
- (
- '\n" " \n" "
\n" " 
\n'
- "\n' "\n"
- " \n"
- " \n"
- ),
- (
- "\n"
- " \n"
- "\n"
- ),
+ ("\n" " \n" " \n"),
+ ("\n" " \n" "\n"),
id="script",
),
pytest.param(
@@ -74,16 +68,8 @@
),
id="complex_js",
),
- pytest.param(
- ("\n"),
- ("\n"),
- id="bad_tag",
- ),
- pytest.param(
- ("\n"),
- ("\n"),
- id="empty",
- ),
+ pytest.param(("\n"), ("\n"), id="bad_tag"),
+ pytest.param(("\n"), ("\n"), id="empty"),
pytest.param(
(
'\n"
- "\n"
- ),
- (
- "\n"
- '\n'
- ),
+ ("\n" "\n"),
+ ("\n" '\n'),
id="single_script",
),
pytest.param(
@@ -401,30 +379,8 @@
id="babel",
),
pytest.param(
- (
- "\n"
- "\n"
- ),
- (
- "\n"
- "\n"
- ),
+ ("\n" "\n"),
+ ("\n" "\n"),
id="legacy",
),
pytest.param(
@@ -530,7 +486,7 @@
@pytest.mark.parametrize(("source", "expected"), test_data)
-def test_base(source, expected, basic_config):
+def test_base(source: str, expected: str, basic_config: Config) -> None:
output = formatter(basic_config, source)
printer(expected, source, output)
diff --git a/tests/test_html/test_tag_small.py b/tests/test_html/test_tag_small.py
index 3ff6c1fbe..444c151a6 100644
--- a/tests/test_html/test_tag_small.py
+++ b/tests/test_html/test_tag_small.py
@@ -2,22 +2,24 @@
poetry run pytest tests/test_html/test_tag_small.py
"""
+
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
import pytest
-from src.djlint.reformat import formatter
+from djlint.reformat import formatter
from tests.conftest import printer
-test_data = [
- pytest.param(
- "text",
- "text\n",
- id="small_tag",
- ),
-]
+if TYPE_CHECKING:
+ from djlint.settings import Config
+
+test_data = [pytest.param("text", "text\n", id="small_tag")]
@pytest.mark.parametrize(("source", "expected"), test_data)
-def test_base(source, expected, basic_config):
+def test_base(source: str, expected: str, basic_config: Config) -> None:
output = formatter(basic_config, source)
printer(expected, source, output)
diff --git a/tests/test_html/test_tag_span.py b/tests/test_html/test_tag_span.py
index cfcefbd18..64a3dff54 100644
--- a/tests/test_html/test_tag_span.py
+++ b/tests/test_html/test_tag_span.py
@@ -2,19 +2,23 @@
poetry run pytest tests/test_html/test_tag_span.py
"""
+
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
import pytest
-from src.djlint.reformat import formatter
+from djlint.reformat import formatter
from tests.conftest import printer
+if TYPE_CHECKING:
+ from djlint.settings import Config
+
test_data = [
pytest.param(
- (
- '\n'
- ),
- (
- '\n'
- ),
+ ('\n'),
+ ('\n'),
id="icon",
),
# issue #171, span is an inline tag
@@ -43,76 +47,34 @@
),
pytest.param(
("
\n"
- " \n"
- "
\n" " \n" " \n"
- "
\n"
- ),
- (
- "\n"
- "
\n"
- ),
+ ("\n" "
\n"),
+ ("\n" "
\n"),
id="more_strings",
),
pytest.param(
("{% if this %}\n"
- ' \n"
- ),
- (
- "\n'
- " \n"
- " \n"
- "\n"
- ' \n"
- ),
+ ("\n'
- " \n"
- " \n"
- "\n" ' \n"),
+ ("\n' " \n" " \n" "\n" ' \n"),
id="nesting",
),
pytest.param(
@@ -39,13 +35,7 @@
" \n' " \n" " \n" "\n"
- ' \n"
- ),
+ ("\n'
- ' \n'
- " \n"
- "\n" ' \n"),
id="attributes",
),
pytest.param(
@@ -55,27 +45,15 @@
),
# test added for https://github.com/djlint/djLint/issues/189
pytest.param(
- (
- "\n"
- " hihi\n"
- "\n' ' \n' " \n" "\n"
- ' \n"
- ),
- (
- "\n"
- " hihi\n"
- "{{ _("Options") }}
\n'
- "\n"
- ' \n"
- ),
+ ("\n" " hihi\n" "{{ _("Options") }}
\n'
- "\n" ' \n"),
+ ("\n" " hihi\n" "{{ _("Options") }}
\n' "\n" ' \n"),
id="a_with_nesting",
),
]
@pytest.mark.parametrize(("source", "expected"), test_data)
-def test_base(source, expected, basic_config):
+def test_base(source: str, expected: str, basic_config: Config) -> None:
output = formatter(basic_config, source)
printer(expected, source, output)
diff --git a/tests/test_html/test_tags.py b/tests/test_html/test_tags.py
index 7cb18eb34..22fef93d6 100644
--- a/tests/test_html/test_tags.py
+++ b/tests/test_html/test_tags.py
@@ -2,11 +2,19 @@
poetry run pytest tests/test_html/test_tags.py
"""
+
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
import pytest
-from src.djlint.reformat import formatter
+from djlint.reformat import formatter
from tests.conftest import printer
+if TYPE_CHECKING:
+ from djlint.settings import Config
+
test_data = [
pytest.param(
('{{ _("Options") }}
\n' " \n"),
- ("\n"),
- id="snippet_18",
- ),
- pytest.param(
- (" \n"),
- ("\n"),
- id="snippet_19",
- ),
- pytest.param(
- (" \n"),
- ("\n"),
- id="snippet_20",
- ),
- pytest.param(
- (" \n"),
- ("\n"),
- id="snippet_21",
- ),
- pytest.param(
- (" \n"),
- ("\n"),
- id="snippet_22",
- ),
- pytest.param(
- (" \n"),
- ("\n"),
- id="snippet_23",
- ),
- pytest.param(
- (" \n"),
- ("\n"),
- id="snippet_24",
- ),
- pytest.param(
- (" \n"),
- ("\n"),
- id="snippet_25",
- ),
- pytest.param(
- ("
\n"),
- ("
\n" "
\n"),
- id="snippet_26",
- ),
- pytest.param(
- ("
\n"),
- ("
\n" "
\n"),
- id="snippet_27",
- ),
- pytest.param(
- ("
\n"),
- ("
\n" "
\n"),
- id="snippet_28",
- ),
- pytest.param(
- ("
\n"),
- ("
\n" "
\n"),
- id="snippet_29",
- ),
- pytest.param(
- (" | \n"),
- (" | \n"),
- id="snippet_30",
- ),
+ pytest.param(("
\n"), ("\n"), id="snippet_18"),
+ pytest.param((" \n"), ("\n"), id="snippet_19"),
+ pytest.param((" \n"), ("\n"), id="snippet_20"),
+ pytest.param((" \n"), ("\n"), id="snippet_21"),
+ pytest.param((" \n"), ("\n"), id="snippet_22"),
+ pytest.param((" \n"), ("\n"), id="snippet_23"),
+ pytest.param((" \n"), ("\n"), id="snippet_24"),
+ pytest.param((" \n"), ("\n"), id="snippet_25"),
+ pytest.param(("
\n"), ("
\n" "
\n"), id="snippet_26"),
+ pytest.param(("
\n"), ("
\n" "
\n"), id="snippet_27"),
+ pytest.param(("
\n"), ("
\n" "
\n"), id="snippet_28"),
+ pytest.param(("
\n"), ("
\n" "
\n"), id="snippet_29"),
+ pytest.param((" | \n"), (" | \n"), id="snippet_30"),
pytest.param(
("
\n"
- " Hello world!
\n"
- ),
- (
- "---mycustomparser\n"
- "title: Hello\n"
- "slug: home\n"
- "---\n"
- "\n"
- "Hello world!
\n"
- ),
+ ("---mycustomparser\n" "title: Hello\n" "slug: home\n" "---\n" "\n" " Hello world!
\n"),
+ ("---mycustomparser\n" "title: Hello\n" "slug: home\n" "---\n" "\n" "Hello world!
\n"),
({}),
id="custom_parser",
),
+ pytest.param(("---\n" "---\n" "\n" " Hello world!
\n"), ("---\n" "---\n" "\n" "Hello world!
\n"), ({}), id="empty"),
+ pytest.param(("---\n" "---\n" "\n" "---\n" "\n"), ("---\n" "---\n" "\n" "---\n"), ({}), id="empty_2"),
+ pytest.param(("---\n" "---\n\n\n" "\n" "---\n" "\n"), ("---\n" "---\n" "\n" "---\n"), ({}), id="blank_lines"),
+ pytest.param(("---\n" "---\n\n\n\n" "{{ this }}\n"), ("---\n" "---\n" "\n" "{{ this }}\n"), ({}), id="blank_lines_2"),
pytest.param(
- ("---\n" "---\n" "\n" " Hello world!
\n"),
- ("---\n" "---\n" "\n" "Hello world!
\n"),
- ({}),
- id="empty",
- ),
- pytest.param(
- ("---\n" "---\n" "\n" "---\n" "\n"),
- ("---\n" "---\n" "\n" "---\n"),
- ({}),
- id="empty_2",
- ),
- pytest.param(
- ("---\n" "---\n\n\n" "\n" "---\n" "\n"),
- ("---\n" "---\n" "\n" "---\n"),
- ({}),
- id="blank_lines",
- ),
- pytest.param(
- ("---\n" "---\n\n\n\n" "{{ this }}\n"),
- ("---\n" "---\n" "\n" "{{ this }}\n"),
- ({}),
- id="blank_lines_2",
- ),
- pytest.param(
- (
- "---\n"
- "layout: foo\n"
- "---\n"
- "Test some html{% endcall %}"),
@@ -19,15 +27,13 @@
id="call_tag_with_function",
),
pytest.param(
- ("{% call (a, b) render_form(form, '
'>) %}"),
- ("{% call (a, b) render_form(form, '
'>) %}\n"),
- id="call_tag_with_nested_html",
+ ("{% call (a, b) render_form(form, '
'>) %}"), ("{% call (a, b) render_form(form, '
'>) %}\n"), id="call_tag_with_nested_html"
),
]
@pytest.mark.parametrize(("source", "expected"), test_data)
-def test_base(source, expected, jinja_config):
+def test_base(source: str, expected: str, jinja_config: Config) -> None:
output = formatter(jinja_config, source)
printer(expected, source, output)
diff --git a/tests/test_jinja/test_parenthesis.py b/tests/test_jinja/test_parenthesis.py
index b84a7d0c5..fb36aedcb 100644
--- a/tests/test_jinja/test_parenthesis.py
+++ b/tests/test_jinja/test_parenthesis.py
@@ -2,17 +2,21 @@
poetry run pytest tests/test_jinja/test_parenthesis.py
"""
+
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
import pytest
-from src.djlint.reformat import formatter
+from djlint.reformat import formatter
from tests.conftest import printer
+if TYPE_CHECKING:
+ from djlint.settings import Config
+
test_data = [
- pytest.param(
- "{{ url('foo') }}",
- '{{ url("foo") }}\n',
- id="single_parenthesis_tag",
- ),
+ pytest.param("{{ url('foo') }}", '{{ url("foo") }}\n', id="single_parenthesis_tag"),
pytest.param(
'',
- '",
+ " href=\"{{ url('foo') }}\">\n",
id="single_escaped quote",
),
pytest.param(
@@ -33,11 +37,7 @@
'Test reminders\n',
id="single_url_for",
),
- pytest.param(
- '{{ url("foo") }}',
- '{{ url("foo") }}\n',
- id="double_parenthesis_tag",
- ),
+ pytest.param('{{ url("foo") }}', '{{ url("foo") }}\n', id="double_parenthesis_tag"),
pytest.param(
'Test reminders',
'Test reminders\n',
@@ -47,7 +47,7 @@
@pytest.mark.parametrize(("source", "expected"), test_data)
-def test_base(source, expected, jinja_config):
+def test_base(source: str, expected: str, jinja_config: Config) -> None:
output = formatter(jinja_config, source)
printer(expected, source, output)
diff --git a/tests/test_linter/test_custom_rules/.djlint_rules.yaml b/tests/test_linter/test_custom_rules/.djlint_rules.yaml
index 5eea89b13..f242fe5bc 100644
--- a/tests/test_linter/test_custom_rules/.djlint_rules.yaml
+++ b/tests/test_linter/test_custom_rules/.djlint_rules.yaml
@@ -3,4 +3,4 @@
message: Find Trichotillomania
flags: re.DOTALL|re.I
patterns:
- - Trichotillomania
+ - Trichotillomania
diff --git a/tests/test_linter/test_custom_rules/test_linter.py b/tests/test_linter/test_custom_rules/test_linter.py
index fb617adb5..92c815768 100644
--- a/tests/test_linter/test_custom_rules/test_linter.py
+++ b/tests/test_linter/test_custom_rules/test_linter.py
@@ -11,18 +11,19 @@
--cov-branch --cov-report xml:coverage.xml --cov-report term-missing
"""
-# pylint: disable=C0116
+from __future__ import annotations
-from click.testing import CliRunner
+from typing import TYPE_CHECKING
-from src.djlint import main as djlint
+from djlint import main as djlint
+
+if TYPE_CHECKING:
+ from click.testing import CliRunner
def test_custom_rules(runner: CliRunner) -> None:
- result = runner.invoke(
- djlint, ["tests/test_linter/test_custom_rules/", "--profile", "django"]
- )
+ result = runner.invoke(djlint, ("tests/test_linter/test_custom_rules/", "--profile", "django"))
assert """Linting""" in result.output
assert """1/1""" in result.output
assert """T001 1:""" in result.output
diff --git a/tests/test_linter/test_custom_rules_bad/.djlint_rules.yaml b/tests/test_linter/test_custom_rules_bad/.djlint_rules.yaml
index 611c25580..1fce3e56a 100644
--- a/tests/test_linter/test_custom_rules_bad/.djlint_rules.yaml
+++ b/tests/test_linter/test_custom_rules_bad/.djlint_rules.yaml
@@ -3,22 +3,22 @@
message: Find Trichotillomania
flags: re.DOTALL|re.I
patterns:
- - Trichotillomania
+ - Trichotillomania
- rule:
name: T002
flags: re.DOTALL|re.I
patterns:
- - Trichotillomania
+ - Trichotillomania
- rule:
name: T003
patterns:
- - Trichotillomania
+ - Trichotillomania
- rule:
name: T004
- rule:
patterns:
- - Trichotillomania
+ - Trichotillomania
diff --git a/tests/test_linter/test_custom_rules_bad/test_linter.py b/tests/test_linter/test_custom_rules_bad/test_linter.py
index 60dcfa9ac..c74d7bf22 100644
--- a/tests/test_linter/test_custom_rules_bad/test_linter.py
+++ b/tests/test_linter/test_custom_rules_bad/test_linter.py
@@ -11,18 +11,19 @@
--cov-branch --cov-report xml:coverage.xml --cov-report term-missing
"""
-# pylint: disable=C0116
+from __future__ import annotations
-from click.testing import CliRunner
+from typing import TYPE_CHECKING
-from src.djlint import main as djlint
+from djlint import main as djlint
+
+if TYPE_CHECKING:
+ from click.testing import CliRunner
def test_custom_rules_bad_config(runner: CliRunner) -> None:
- result = runner.invoke(
- djlint, ["tests/test_linter/test_custom_rules_bad", "--profile", "django"]
- )
+ result = runner.invoke(djlint, ("tests/test_linter/test_custom_rules_bad", "--profile", "django"))
assert """Linting""" in result.output
assert """1/1""" in result.output
assert """T001 1:""" in result.output
diff --git a/tests/test_linter/test_django_linter.py b/tests/test_linter/test_django_linter.py
index da73d588c..cec8de33b 100644
--- a/tests/test_linter/test_django_linter.py
+++ b/tests/test_linter/test_django_linter.py
@@ -4,125 +4,58 @@
"""
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
import pytest
-from src.djlint.lint import linter
+from djlint.lint import linter
from tests.conftest import lint_printer
+if TYPE_CHECKING:
+ from djlint.lint import LintError
+ from djlint.settings import Config
+
test_data = [
pytest.param(
("{{test }}\n{% test%}"),
- (
- [
- {
- "code": "T001",
- "line": "1:0",
- "match": "{{test }}",
- "message": "Variables should be wrapped in a whitespace.",
- },
- {
- "code": "T001",
- "line": "2:0",
- "match": "{% test%}",
- "message": "Variables should be wrapped in a whitespace.",
- },
- {
- "code": "H025",
- "line": "2:9",
- "match": "",
- "message": "Tag seems to be an orphan.",
- },
- ]
- ),
+ ([
+ {"code": "T001", "line": "1:0", "match": "{{test }}", "message": "Variables should be wrapped in a whitespace."},
+ {"code": "T001", "line": "2:0", "match": "{% test%}", "message": "Variables should be wrapped in a whitespace."},
+ {"code": "H025", "line": "2:9", "match": "", "message": "Tag seems to be an orphan."},
+ ]),
id="T001",
),
pytest.param(
("{% extends 'this' %}"),
- (
- [
- {
- "code": "T002",
- "line": "1:0",
- "match": "{% extends 'this' %}",
- "message": "Double quotes should be used in tags.",
- }
- ]
- ),
+ ([{"code": "T002", "line": "1:0", "match": "{% extends 'this' %}", "message": "Double quotes should be used in tags."}]),
id="T002",
),
- pytest.param(
- ("{% extends this %}"),
- ([]),
- id="T002_unquoted_var_names",
- ),
+ pytest.param(("{% extends this %}"), ([]), id="T002_unquoted_var_names"),
pytest.param(
("{% with a='this' %}"),
- (
- [
- {
- "code": "T002",
- "line": "1:0",
- "match": "{% with a='this' %}",
- "message": "Double quotes should be used in tags.",
- }
- ]
- ),
+ ([{"code": "T002", "line": "1:0", "match": "{% with a='this' %}", "message": "Double quotes should be used in tags."}]),
id="T002_with",
),
pytest.param(
("{% trans 'this' %}"),
- (
- [
- {
- "code": "T002",
- "line": "1:0",
- "match": "{% trans 'this' %}",
- "message": "Double quotes should be used in tags.",
- }
- ]
- ),
+ ([{"code": "T002", "line": "1:0", "match": "{% trans 'this' %}", "message": "Double quotes should be used in tags."}]),
id="T002_trans",
),
pytest.param(
("{% translate 'this' %}"),
- (
- [
- {
- "code": "T002",
- "line": "1:0",
- "match": "{% translate 'this' ",
- "message": "Double quotes should be used in tags.",
- }
- ]
- ),
+ ([{"code": "T002", "line": "1:0", "match": "{% translate 'this' ", "message": "Double quotes should be used in tags."}]),
id="T002_translate",
),
pytest.param(
("{% include 'this' %}"),
- (
- [
- {
- "code": "T002",
- "line": "1:0",
- "match": "{% include 'this' %}",
- "message": "Double quotes should be used in tags.",
- }
- ]
- ),
+ ([{"code": "T002", "line": "1:0", "match": "{% include 'this' %}", "message": "Double quotes should be used in tags."}]),
id="T002_include",
),
pytest.param(
("{% now 'Y-m-d G:i:s' %}"),
- (
- [
- {
- "code": "T002",
- "line": "1:0",
- "match": "{% now 'Y-m-d G:i:s'",
- "message": "Double quotes should be used in tags.",
- }
- ]
- ),
+ ([{"code": "T002", "line": "1:0", "match": "{% now 'Y-m-d G:i:s'", "message": "Double quotes should be used in tags."}]),
id="T002_now",
),
pytest.param(
@@ -130,343 +63,152 @@
'{% extends "layout.h" %}\n'
'\n'
'{% include "template.html" %}\n'
- ""
- ),
- (
- [
- {
- "code": "H025",
- "line": "2:0",
- "match": '"
),
+ ([{"code": "H025", "line": "2:0", "match": ''),
- (
- [
- {
- "code": "D004",
- "line": "1:0",
- "match": '\n'
- ''
- ),
- (
- [
- {
- "code": "D018",
- "line": "1:0",
- "match": '\n' ''),
+ ([
+ {
+ "code": "D018",
+ "line": "1:0",
+ "match": '\n' ''),
- (
- [
- {
- "code": "H019",
- "line": "1:0",
- "match": '\n'
- ),
- ([]),
- id="DJ018_has_urls",
- ),
+ pytest.param(('\n'), ([]), id="DJ018_has_urls"),
pytest.param(
(''),
- (
- [
- {
- "code": "D018",
- "line": "1:0",
- "match": ''),
- ([]),
- id="DJ018_mailto",
- ),
- pytest.param(
- (''),
- ([]),
- id="DJ018_data",
- ),
- pytest.param(
- (''),
- ([]),
- id="DJ018_attribute_names",
- ),
- pytest.param(
- (''),
- ([]),
- id="DJ018_data_action",
- ),
- pytest.param(
- (''),
- ([]),
- id="DJ018_action_attr_url",
- ),
+ pytest.param((''), ([]), id="DJ018_mailto"),
+ pytest.param((''), ([]), id="DJ018_data"),
+ pytest.param((''), ([]), id="DJ018_data"),
+ pytest.param((''), ([]), id="DJ018_attribute_names"),
+ pytest.param((''), ([]), id="DJ018_data_action"),
+ pytest.param((''), ([]), id="DJ018_action_attr_url"),
pytest.param(
("{% blah 'asdf %}"),
- (
- [
- {
- "code": "T027",
- "line": "1:0",
- "match": "{% blah 'asdf %}",
- "message": "Unclosed string found in template syntax.",
- }
- ]
- ),
+ ([{"code": "T027", "line": "1:0", "match": "{% blah 'asdf %}", "message": "Unclosed string found in template syntax."}]),
id="T027",
),
- pytest.param(
- ("{% blah 'asdf' %}{{ blah \"asdf\" }}"),
- ([]),
- id="T027_no",
- ),
+ pytest.param(("{% blah 'asdf' %}{{ blah \"asdf\" }}"), ([]), id="T027_no"),
pytest.param(
("{% blah 'asdf' 'blah %}"),
- (
- [
- {
- "code": "T027",
- "line": "1:0",
- "match": "{% blah 'asdf' 'blah",
- "message": "Unclosed string found in template syntax.",
- }
- ]
- ),
+ ([{"code": "T027", "line": "1:0", "match": "{% blah 'asdf' 'blah", "message": "Unclosed string found in template syntax."}]),
id="T027_long_name",
),
- pytest.param(
- ('{% trans "Check box if you\'re interested in this location." %}'),
- ([]),
- id="T027_trans",
- ),
- pytest.param(
- ('{% trans "Check box if you\'re interested in this location." %}'),
- ([]),
- id="T027_golang comment",
- ),
- pytest.param(
- ("{{/* can't */}}"),
- ([]),
- id="T027_mixed_quotes",
- ),
+ pytest.param(('{% trans "Check box if you\'re interested in this location." %}'), ([]), id="T027_trans"),
+ pytest.param(('{% trans "Check box if you\'re interested in this location." %}'), ([]), id="T027_golang comment"),
+ pytest.param(("{{/* can't */}}"), ([]), id="T027_mixed_quotes"),
pytest.param(
(""),
- (
- [
- {
- "code": "H025",
- "line": "1:0",
- "match": ""),
- (
- [
- {
- "code": "H025",
- "line": "1:0",
- "match": ""),
- (
- [
- {
- "code": "H025",
- "line": "1:0",
- "match": "'),
- ([]),
- id="T028_no_7",
- ),
+ pytest.param(("{% blah 'asdf' %}"), ([]), id="T028_no_5"),
+ pytest.param(("{% for 'asdf' %}"), ([]), id="T028_no_6"),
+ pytest.param((''), ([]), id="T028_no_7"),
pytest.param(
("{% static '' \" \" 'foo/bar.min.css' %}"),
- (
- [
- {
- "code": "T032",
- "line": "1:0",
- "match": "{% static ''",
- "message": "Extra whitespace found in template tags.",
- }
- ]
- ),
+ ([{"code": "T032", "line": "1:0", "match": "{% static ''", "message": "Extra whitespace found in template tags."}]),
id="T032",
),
pytest.param(
("{% static '' %}"),
- (
- [
- {
- "code": "T032",
- "line": "1:0",
- "match": "{% static",
- "message": "Extra whitespace found in template tags.",
- }
- ]
- ),
+ ([{"code": "T032", "line": "1:0", "match": "{% static", "message": "Extra whitespace found in template tags."}]),
id="T032_2",
),
- pytest.param(
- ("{% static '' \" \" 'foo/bar.min.css' %}"),
- ([]),
- id="T032_no",
- ),
+ pytest.param(("{% static '' \" \" 'foo/bar.min.css' %}"), ([]), id="T032_no"),
pytest.param(
("{{ static '' \" \" 'foo/bar.min.css' }}"),
- (
- [
- {
- "code": "T032",
- "line": "1:0",
- "match": "{{ static ''",
- "message": "Extra whitespace found in template tags.",
- }
- ]
- ),
+ ([{"code": "T032", "line": "1:0", "match": "{{ static ''", "message": "Extra whitespace found in template tags."}]),
id="T032_3",
),
pytest.param(
("{{ static '' }}"),
- (
- [
- {
- "code": "T032",
- "line": "1:0",
- "match": "{{ static",
- "message": "Extra whitespace found in template tags.",
- }
- ]
- ),
+ ([{"code": "T032", "line": "1:0", "match": "{{ static", "message": "Extra whitespace found in template tags."}]),
id="T032_4",
),
- pytest.param(
- ("{{ static '' \" \" 'foo/bar.min.css' }}"),
- ([]),
- id="T032_no_2",
- ),
+ pytest.param(("{{ static '' \" \" 'foo/bar.min.css' }}"), ([]), id="T032_no_2"),
]
@pytest.mark.parametrize(("source", "expected"), test_data)
-def test_base(source, expected, django_config):
+def test_base(source: str, expected: list[LintError], django_config: Config) -> None:
filename = "test.html"
output = linter(django_config, source, filename, filename)
lint_printer(source, expected, output[filename])
- mismatch = list(filter(lambda x: x not in expected, output[filename])) + list(
- filter(lambda x: x not in output[filename], expected)
- )
-
- assert len(mismatch) == 0
+ mismatch = (*(x for x in output[filename] if x not in expected), *(x for x in expected if x not in output[filename]))
+ assert not mismatch
diff --git a/tests/test_linter/test_h005.py b/tests/test_linter/test_h005.py
index 4ce0dbdcf..ff393e08d 100644
--- a/tests/test_linter/test_h005.py
+++ b/tests/test_linter/test_h005.py
@@ -2,58 +2,39 @@
poetry run pytest tests/test_linter/test_h005.py
"""
+
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
import pytest
-from src.djlint.lint import linter
+from djlint.lint import linter
from tests.conftest import lint_printer
+if TYPE_CHECKING:
+ from djlint.lint import LintError
+ from djlint.settings import Config
+
test_data = [
pytest.param(
("\n"),
- (
- [
- {
- "code": "H005",
- "line": "2:0",
- "match": "",
- "message": "Html tag should have lang attribute.",
- },
- {
- "code": "H025",
- "line": "2:0",
- "match": "",
- "message": "Tag seems to be an orphan.",
- },
- ]
- ),
- id="one",
- ),
- pytest.param(
- ("'),
- (
- [
- {
- "code": "H006",
- "line": "1:0",
- "match": '
',
- "message": "Img tag should have height and width attributes.",
- }
- ]
- ),
+ ([{"code": "H006", "line": "1:0", "match": '
', "message": "Img tag should have height and width attributes."}]),
id="one",
),
- pytest.param(
- ('
'),
- ([]),
- id="line break",
- ),
+ pytest.param(('
'), ([]), id="line break"),
pytest.param(
(
'{# [INFO][JINJA] I use syntax "{% if
"),
- (
- [
- {
- "code": "H006",
- "line": "1:0",
- "match": "
",
- "message": "Img tag should have height and width attributes.",
- },
- {
- "code": "H006",
- "line": "1:5",
- "match": "
",
- "message": "Img tag should have height and width attributes.",
- },
- {
- "code": "H013",
- "line": "1:0",
- "match": "
",
- "message": "Img tag should have an alt attribute.",
- },
- {
- "code": "H013",
- "line": "1:5",
- "match": "
",
- "message": "Img tag should have an alt attribute.",
- },
- ]
- ),
+ ([
+ {"code": "H006", "line": "1:0", "match": "
", "message": "Img tag should have height and width attributes."},
+ {"code": "H006", "line": "1:5", "match": "
", "message": "Img tag should have height and width attributes."},
+ {"code": "H013", "line": "1:0", "match": "
", "message": "Img tag should have an alt attribute."},
+ {"code": "H013", "line": "1:5", "match": "
", "message": "Img tag should have an alt attribute."},
+ ]),
id="test empty with two blocks",
),
]
@pytest.mark.parametrize(("source", "expected"), test_data)
-def test_base(source, expected, basic_config):
+def test_base(source: str, expected: list[LintError], basic_config: Config) -> None:
filename = "test.html"
output = linter(basic_config, source, filename, filename)
lint_printer(source, expected, output[filename])
- mismatch = list(filter(lambda x: x not in expected, output[filename])) + list(
- filter(lambda x: x not in output[filename], expected)
- )
-
- assert len(mismatch) == 0
+ mismatch = (*(x for x in output[filename] if x not in expected), *(x for x in expected if x not in output[filename]))
+ assert not mismatch
diff --git a/tests/test_linter/test_h007.py b/tests/test_linter/test_h007.py
index 662f46682..4dbda69b0 100644
--- a/tests/test_linter/test_h007.py
+++ b/tests/test_linter/test_h007.py
@@ -2,44 +2,38 @@
poetry run pytest tests/test_linter/test_h007.py
"""
+
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
import pytest
-from src.djlint.lint import linter
+from djlint.lint import linter
from tests.conftest import lint_printer
+if TYPE_CHECKING:
+ from djlint.lint import LintError
+ from djlint.settings import Config
+
test_data = [
pytest.param(
(''),
- (
- [
- {
- "code": "H007",
- "line": "1:0",
- "match": "
"),
- (
- [
- {
- "code": "H008",
- "line": "1:0",
- "match": "",
- "message": "Tag seems to be an orphan.",
- },
- ]
- ),
+ ([
+ {"code": "H008", "line": "1:0", "match": "", "message": "Tag seems to be an orphan."},
+ ]),
id="one",
),
pytest.param(
(""),
- (
- [
- {
- "code": "H008",
- "line": "1:0",
- "match": "'
- ),
- ([]),
- id="one",
- ),
+ pytest.param((''), ([]), id="one"),
]
@pytest.mark.parametrize(("source", "expected"), test_data)
-def test_base(source, expected, basic_config):
+def test_base(source: str, expected: list[LintError], basic_config: Config) -> None:
filename = "test.html"
output = linter(basic_config, source, filename, filename)
lint_printer(source, expected, output[filename])
- mismatch = list(filter(lambda x: x not in expected, output[filename])) + list(
- filter(lambda x: x not in output[filename], expected)
- )
-
- assert len(mismatch) == 0
+ mismatch = (*(x for x in output[filename] if x not in expected), *(x for x in expected if x not in output[filename]))
+ assert not mismatch
diff --git a/tests/test_linter/test_h009.py b/tests/test_linter/test_h009.py
index 44c01c1ce..94d46f826 100644
--- a/tests/test_linter/test_h009.py
+++ b/tests/test_linter/test_h009.py
@@ -2,64 +2,46 @@
poetry run pytest tests/test_linter/test_h009.py
"""
+
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
import pytest
-from src.djlint.lint import linter
+from djlint.lint import linter
from tests.conftest import lint_printer
+if TYPE_CHECKING:
+ from djlint.lint import LintError
+ from djlint.settings import Config
+
test_data = [
pytest.param(
("h1
"),
- (
- [
- {
- "code": "H009",
- "line": "1:1",
- "match": "H1",
- "message": "Tag names should be lowercase.",
- },
- {
- "code": "H009",
- "line": "1:7",
- "match": "/H1",
- "message": "Tag names should be lowercase.",
- },
- ]
- ),
+ ([
+ {"code": "H009", "line": "1:1", "match": "H1", "message": "Tag names should be lowercase."},
+ {"code": "H009", "line": "1:7", "match": "/H1", "message": "Tag names should be lowercase."},
+ ]),
id="opening",
),
pytest.param(
("'),
- (
- [
- {
- "code": "H010",
- "line": "1:0",
- "match": "
ID=username"),
- ([]),
+ ([{"code": "H010", "line": "1:0", "match": "
ID=username"), ([]), id="opening"),
]
@pytest.mark.parametrize(("source", "expected"), test_data)
-def test_base(source, expected, basic_config):
+def test_base(source: str, expected: list[LintError], basic_config: Config) -> None:
filename = "test.html"
output = linter(basic_config, source, filename, filename)
lint_printer(source, expected, output[filename])
- mismatch = list(filter(lambda x: x not in expected, output[filename])) + list(
- filter(lambda x: x not in output[filename], expected)
- )
-
- assert len(mismatch) == 0
+ mismatch = (*(x for x in output[filename] if x not in expected), *(x for x in expected if x not in output[filename]))
+ assert not mismatch
diff --git a/tests/test_linter/test_h021.py b/tests/test_linter/test_h021.py
index a370fdcdc..1595274fb 100644
--- a/tests/test_linter/test_h021.py
+++ b/tests/test_linter/test_h021.py
@@ -2,89 +2,51 @@
poetry run pytest tests/test_linter/test_h021.py
"""
+
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
import pytest
-from src.djlint.lint import linter
+from djlint.lint import linter
from tests.conftest import lint_printer
+if TYPE_CHECKING:
+ from djlint.lint import LintError
+ from djlint.settings import Config
+
test_data = [
pytest.param(
(''),
- (
- [
- {
- "code": "H021",
- "line": "1:0",
- "match": "'
- ),
- ([]),
- id="missing",
- ),
- pytest.param(
- ('CSS'),
- ([]),
- id="outside tag",
- ),
+ pytest.param((''), ([]), id="missing"),
+ pytest.param(('CSS'), ([]), id="outside tag"),
pytest.param(
('
'),
- (
- [
- {
- "code": "H025",
- "line": "1:21",
- "match": 'CSS'),
- ([]),
- id="outside tag",
- ),
+ pytest.param(('CSS'), ([]), id="outside tag"),
pytest.param(
('\n' ""),
- (
- [
- {
- "code": "H021",
- "line": "1:0",
- "match": " None:
filename = "test.html"
output = linter(basic_config, source, filename, filename)
lint_printer(source, expected, output[filename])
- mismatch = list(filter(lambda x: x not in expected, output[filename])) + list(
- filter(lambda x: x not in output[filename], expected)
- )
-
- assert len(mismatch) == 0
+ mismatch = (*(x for x in output[filename] if x not in expected), *(x for x in expected if x not in output[filename]))
+ assert not mismatch
diff --git a/tests/test_linter/test_h026.py b/tests/test_linter/test_h026.py
index a46893ba5..e8a37028a 100644
--- a/tests/test_linter/test_h026.py
+++ b/tests/test_linter/test_h026.py
@@ -2,101 +2,57 @@
poetry run pytest tests/test_linter/test_h026.py
"""
+
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
import pytest
-from src.djlint.lint import linter
+from djlint.lint import linter
from tests.conftest import lint_printer
+if TYPE_CHECKING:
+ from djlint.lint import LintError
+ from djlint.settings import Config
+
test_data = [
pytest.param(
('