paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-01 20:44:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

templates: Mark all void tags as self-closing.

Browse Source 
This reverses the policy that was set, but incompletely enforced, by
commit 951514dd7d.  The self-closing tag
syntax is clearer, more consistent, simpler to parse, compatible with
XML, preferred by Prettier, and (most importantly now) required by
FormatJS.

Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
Anders Kaseorg
2021-04-20 15:46:14 -07:00
committed by Tim Abbott
parent 7177529107
commit dd3fa4ac52
84 changed files with 345 additions and 346 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
tools/tests/test_html_branches.py
View File

@@ -3,6 +3,7 @@ import unittest
import tools.lib.template_parser
from tools.lib.html_branches import (
Node,
build_id_dict,
get_tag_info,
html_branches,
@@ -49,35 +50,40 @@ class TestHtmlBranches(unittest.TestCase):
tree = html_tag_tree(html)
assert tree.children[0].token is not None
self.assertEqual(tree.children[0].token.kind, "html_start")
self.assertEqual(tree.children[0].token.tag, "html")
def serialize(node: Node) -> object:
return (
node.token and (node.token.kind, node.token.tag),
[serialize(child) for child in node.children],
)
assert tree.children[0].children[0].token is not None
self.assertEqual(tree.children[0].children[0].token.kind, "html_start")
self.assertEqual(tree.children[0].children[0].token.tag, "head")
assert tree.children[0].children[0].children[0].token is not None
self.assertEqual(tree.children[0].children[0].children[0].token.kind, "html_start")
self.assertEqual(tree.children[0].children[0].children[0].token.tag, "title")
assert tree.children[0].children[1].token is not None
self.assertEqual(tree.children[0].children[1].token.kind, "html_start")
self.assertEqual(tree.children[0].children[1].token.tag, "body")
assert tree.children[0].children[1].children[0].token is not None
self.assertEqual(tree.children[0].children[1].children[0].token.kind, "html_start")
self.assertEqual(tree.children[0].children[1].children[0].token.tag, "p")
assert tree.children[0].children[1].children[0].children[0].token is not None
self.assertEqual(
tree.children[0].children[1].children[0].children[0].token.kind, "html_singleton"
expected = (
None,
[
(
("html_start", "html"),
[
(
("html_start", "head"),
[
(("html_start", "title"), []),
(("html_singleton", "meta"), []),
(("html_singleton", "link"), []),
],
),
(
("html_start", "body"),
[
(
("html_start", "p"),
[(("html_start", "br"), []), (("html_start", "p"), [])],
)
],
),
],
)
],
)
self.assertEqual(tree.children[0].children[1].children[0].children[0].token.tag, "br")
assert tree.children[0].children[1].children[1].token is not None
self.assertEqual(tree.children[0].children[1].children[1].token.kind, "html_start")
self.assertEqual(tree.children[0].children[1].children[1].token.tag, "p")
self.assertEqual(serialize(tree), expected)
def test_html_branches(self) -> None:
html = """
@@ -99,19 +105,16 @@ class TestHtmlBranches(unittest.TestCase):
"""
branches = html_branches(html)
self.assertEqual(branches[0].text(), "html head title")
self.assertEqual(branches[1].text(), "html body p br")
self.assertEqual(branches[2].text(), "html body p")
self.assertEqual(
branches[0].staircase_text(), "\n html\n head\n title\n"
[(branch.text(), branch.staircase_text()) for branch in branches],
[
("html head title", "\n html\n head\n title\n"),
("html head meta", "\n html\n head\n meta\n"),
("html head link", "\n html\n head\n link\n"),
("html body p br", "\n html\n body\n p\n br\n"),
("html body p p", "\n html\n body\n p\n p\n"),
],
)
self.assertEqual(
branches[1].staircase_text(),
"\n html\n body\n p\n br\n",
)
self.assertEqual(branches[2].staircase_text(), "\n html\n body\n p\n")
def test_build_id_dict(self) -> None:
templates = ["test_template1.html", "test_template2.html"]

8
tools/tests/test_pretty_print.py
View File

@@ -20,7 +20,7 @@ BAD_HTML = """
<link rel="stylesheet" href="style.css" />
</head>
<body>
<div><p>Hello<br>world!</p></div>
<div><p>Hello<br />world!</p></div>
<p>Goodbye<!-- test -->world!</p>
<table>
<tr>
@@ -52,7 +52,7 @@ GOOD_HTML = """
<link rel="stylesheet" href="style.css" />
</head>
<body>
<div><p>Hello<br>world!</p></div>
<div><p>Hello<br />world!</p></div>
<p>Goodbye<!-- test -->world!</p>
<table>
<tr>
@@ -338,7 +338,7 @@ BAD_HTML13 = """
{{#if this.is_realm_emoji}}
<img src="{{this.url}}" class="emoji" />
{{else}}
<br>
<br />
{{/if}}
{{/if}}
<div>{{this.count}}</div>
@@ -353,7 +353,7 @@ GOOD_HTML13 = """
{{#if this.is_realm_emoji}}
<img src="{{this.url}}" class="emoji" />
{{else}}
<br>
<br />
{{/if}}
{{/if}}
<div>{{this.count}}</div>

8
tools/tests/test_template_parser.py
View File

@@ -260,23 +260,23 @@ class ParserTest(unittest.TestCase):
validate(text=my_html)
def test_tokenize(self) -> None:
tag = "<meta whatever>bla"
tag = "<!DOCTYPE html>"
token = tokenize(tag)[0]
self.assertEqual(token.kind, "html_special")
self.assertEqual(token.kind, "html_doctype")
tag = "<a>bla"
token = tokenize(tag)[0]
self.assertEqual(token.kind, "html_start")
self.assertEqual(token.tag, "a")
tag = "<br>bla"
tag = "<br />bla"
token = tokenize(tag)[0]
self.assertEqual(token.kind, "html_singleton")
self.assertEqual(token.tag, "br")
tag = "<input>bla"
token = tokenize(tag)[0]
self.assertEqual(token.kind, "html_singleton")
self.assertEqual(token.kind, "html_start") # We later mark this an error.
self.assertEqual(token.tag, "input")
tag = "<input />bla"