Skip to content

Fix and improve .assertValidHTML() test method #1597

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Apr 12, 2022
Merged

Fix and improve .assertValidHTML() test method #1597

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cbcc626
Make .assertValidHTML() parse passed content
living180 Mar 20, 2022
4ef7432
Fix test failure exposed by previous commit
living180 Mar 20, 2022
70b836b
Remove unused .assertValidHTML() msg argument
living180 Mar 20, 2022
3cd9b9f
Tweak .assertValidHTML() exception message
living180 Mar 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions tests/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,18 +31,16 @@ def tearDown(self):
def get_response(self, request):
return self._get_response(request)

def assertValidHTML(self, content, msg=None):
def assertValidHTML(self, content):
parser = html5lib.HTMLParser()
parser.parseFragment(self.panel.content)
parser.parseFragment(content)
if parser.errors:
default_msg = ["Content is invalid HTML:"]
msg_parts = ["Invalid HTML:"]
lines = content.split("\n")
for position, errorcode, datavars in parser.errors:
default_msg.append(" %s" % html5lib.constants.E[errorcode] % datavars)
default_msg.append(" %s" % lines[position[0] - 1])

msg = self._formatMessage(msg, "\n".join(default_msg))
raise self.failureException(msg)
msg_parts.append(" %s" % html5lib.constants.E[errorcode] % datavars)
msg_parts.append(" %s" % lines[position[0] - 1])
raise self.failureException("\n".join(msg_parts))


class IntegrationTestCase(TestCase):
Expand Down
2 changes: 1 addition & 1 deletion tests/panels/test_template.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ def test_template_repr(self):

User.objects.create(username="admin")
bad_repr = TemplateReprForm()
t = Template("{{ bad_repr }}")
t = Template("<table>{{ bad_repr }}</table>")
c = Context({"bad_repr": bad_repr})
html = t.render(c)
self.assertIsNotNone(html)
Expand Down