djlint 1.28.0 → 1.30.0

package/tests/test_html/test_tag_span.py

@@ -0,0 +1,119 @@
+"""Test html span tag.
+
+poetry run pytest tests/test_html/test_tag_span.py
+"""
+import pytest
+
+from src.djlint.reformat import formatter
+from tests.conftest import printer
+
+test_data = [
+    pytest.param(
+        (
+            '<span class="icon has-text-grey is-large "><i class="fas fa-lg fa-star"></i></span>\n'
+        ),
+        (
+            '<span class="icon has-text-grey is-large "><i class="fas fa-lg fa-star"></i></span>\n'
+        ),
+        id="icon",
+    ),
+    # issue #171, span is an inline tag
+    pytest.param(
+        (
+            '<div class="hi">\n'
+            '    <div class="poor">\n'
+            '        <p class="format">\n'
+            "            <strong>H</strong>ello stranger, <strong>do not wrap span</strong>, <strong>pls</strong>.\n"
+            '            <span class="big">H</span>ello stranger, <strong>do not wrap span</strong>, <span class="big">pls</span>.\n'
+            "        </p>\n"
+            "    </div>\n"
+            "</div>\n"
+        ),
+        (
+            '<div class="hi">\n'
+            '    <div class="poor">\n'
+            '        <p class="format">\n'
+            "            <strong>H</strong>ello stranger, <strong>do not wrap span</strong>, <strong>pls</strong>.\n"
+            '            <span class="big">H</span>ello stranger, <strong>do not wrap span</strong>, <span class="big">pls</span>.\n'
+            "        </p>\n"
+            "    </div>\n"
+            "</div>\n"
+        ),
+        id="inline",
+    ),
+    pytest.param(
+        ("<p><p><span><strong>asdf</strong><br></span></p></p>\n"),
+        (
+            "<p>\n"
+            "    <p>\n"
+            "        <span><strong>asdf</strong>\n"
+            "            <br>\n"
+            "        </span>\n"
+            "    </p>\n"
+            "</p>\n"
+        ),
+        id="nested string",
+    ),
+    pytest.param(
+        (
+            "<ul>\n"
+            "    <li>\n"
+            "        <span>C</span> <a>D</a> <strong>Q</strong>\n"
+            "    </li>\n"
+            "</ul>\n"
+        ),
+        (
+            "<ul>\n"
+            "    <li>\n"
+            "        <span>C</span> <a>D</a> <strong>Q</strong>\n"
+            "    </li>\n"
+            "</ul>\n"
+        ),
+        id="more_strings",
+    ),
+    pytest.param(
+        ("{% if this %}<p>Text <span>text</span></p>{% endif %}\n"),
+        (
+            "{% if this %}\n"
+            "    <p>\n"
+            "        Text <span>text</span>\n"
+            "    </p>\n"
+            "{% endif %}\n"
+        ),
+        id="span_leading_text",
+    ),
+    pytest.param(
+        (
+            "<p>\n"
+            '    <span class="badge">New</span> You can now use <strong>this feature</strong>\n'
+            "</p>\n"
+        ),
+        (
+            "<p>\n"
+            '    <span class="badge">New</span> You can now use <strong>this feature</strong>\n'
+            "</p>\n"
+        ),
+        id="span_text_strong",
+    ),
+    pytest.param(
+        (
+            "{% block content %}\n"
+            "    <span></span>{% blocktrans %}<div></div>{% endblocktrans %}\n"
+            "    {% endblock content %}\n"
+        ),
+        (
+            "{% block content %}\n"
+            "    <span></span>{% blocktrans %}<div></div>{% endblocktrans %}\n"
+            "{% endblock content %}\n"
+        ),
+        id="span_with_template",
+    ),
+]
+
+
+@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_html/test_tag_textarea.py

@@ -0,0 +1,82 @@
+"""Test html textarea tag.
+
+poetry run pytest tests/test_html/test_tag_textarea.py
+"""
+import pytest
+
+from src.djlint.reformat import formatter
+from tests.conftest import printer
+
+test_data = [
+    pytest.param(
+        ("<div><textarea>\n" "asdf\n" "  asdf</textarea></div>\n"),
+        ("<div>\n" "    <textarea>\n" "asdf\n" "  asdf</textarea>\n" "</div>\n"),
+        id="textarea",
+    ),
+    pytest.param(
+        (
+            "<div>\n"
+            '    <div class="field">\n'
+            "        <textarea>asdf</textarea>\n"
+            "    </div>\n"
+            "</div>\n"
+        ),
+        (
+            "<div>\n"
+            '    <div class="field">\n'
+            "        <textarea>asdf</textarea>\n"
+            "    </div>\n"
+            "</div>\n"
+        ),
+        id="nesting",
+    ),
+    pytest.param(
+        (
+            "<div>\n"
+            '    <div class="field">\n'
+            '        <textarea class="this"\n'
+            '                  name="that">asdf</textarea>\n'
+            "    </div>\n"
+            "</div>\n"
+        ),
+        (
+            "<div>\n"
+            '    <div class="field">\n'
+            '        <textarea class="this" name="that">asdf</textarea>\n'
+            "    </div>\n"
+            "</div>\n"
+        ),
+        id="attributes",
+    ),
+    pytest.param(
+        ("<p>\n" '    some nice text <a href="this">asdf</a>, ok\n' "</p>\n"),
+        ("<p>\n" '    some nice text <a href="this">asdf</a>, ok\n' "</p>\n"),
+        id="a_tag",
+    ),
+    # test added for https://github.com/Riverside-Healthcare/djLint/issues/189
+    pytest.param(
+        (
+            "<a>\n"
+            "    <span>hi</span>hi</a>\n"
+            "<div>\n"
+            '    <h4>{{ _("Options") }}</h4>\n'
+            "</div>\n"
+        ),
+        (
+            "<a>\n"
+            "    <span>hi</span>hi</a>\n"
+            "<div>\n"
+            '    <h4>{{ _("Options") }}</h4>\n'
+            "</div>\n"
+        ),
+        id="a_with_nesting",
+    ),
+]
+
+
+@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