mirrors/wagtail
mirrors/wagtail
0
0
Fork 0
mirror of https://github.com/wagtail/wagtail.git synced 2024-12-01 11:41:20 +01:00
Code Issues Releases Wiki Activity

Add allow_extra_attrs option to assertTagInHTML

Browse Source
This commit is contained in:
Matt Westcott 2017-02-27 19:33:09 +00:00 committed by Mikalai Radchuk
parent 06605acae3
commit 68fa4dbea8
2 changed files with 49 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
wagtail/tests/utils.py
View File

@ -136,11 +136,41 @@ class WagtailTestUtils(object):
return False
return True
def _count_tag_occurrences(self, needle, haystack):
count = 1 if self._tag_is_equal(needle, haystack) else 0
def _tag_matches_with_extra_attrs(self, thin_tag, fat_tag):
# return true if thin_tag and fat_tag have the same name,
# and all attributes on thin_tag exist on fat_tag
if not hasattr(thin_tag, 'name') or not hasattr(fat_tag, 'name'):
return False
if thin_tag.name != fat_tag.name:
return False
for attr, value in thin_tag.attributes:
if value is None:
# attributes without a value is same as attribute with value that
# equals the attributes name:
# <input checked> == <input checked="checked">
if (attr, None) not in fat_tag.attributes and (attr, attr) not in fat_tag.attributes:
return False
else:
if (attr, value) not in fat_tag.attributes:
return False
return True
def _count_tag_occurrences(self, needle, haystack, allow_extra_attrs=False):
count = 0
if allow_extra_attrs:
if self._tag_matches_with_extra_attrs(needle, haystack):
count += 1
else:
if self._tag_is_equal(needle, haystack):
count += 1
if hasattr(haystack, 'children'):
count += sum(self._count_tag_occurrences(needle, child) for child in haystack.children)
count += sum(
self._count_tag_occurrences(needle, child, allow_extra_attrs=allow_extra_attrs)
for child in haystack.children
)
return count
@ -160,10 +190,10 @@ class WagtailTestUtils(object):
for script_tag in self._find_template_script_tags(child):
yield script_tag
def assertTagInHTML(self, needle, haystack, count=None, msg_prefix=''):
def assertTagInHTML(self, needle, haystack, count=None, msg_prefix='', allow_extra_attrs=False):
needle = assert_and_parse_html(self, needle, None, 'First argument is not valid HTML:')
haystack = assert_and_parse_html(self, haystack, None, 'Second argument is not valid HTML:')
real_count = self._count_tag_occurrences(needle, haystack)
real_count = self._count_tag_occurrences(needle, haystack, allow_extra_attrs=allow_extra_attrs)
if count is not None:
self.assertEqual(
real_count, count,

14
wagtail/wagtailcore/tests/test_tests.py
View File

@ -29,6 +29,20 @@ class TestAssertTagInHTML(TestCase, WagtailTestUtils):
with self.assertRaises(AssertionError):
self.assertTagInHTML('<li lang="en" class="important really" data-extra="boom">', haystack)
def test_assert_tag_in_html_with_extra_attrs(self):
haystack = """<ul>
<li class="normal">hugh</li>
<li class="normal">pugh</li>
<li class="really important" lang="en"><em>barney</em> mcgrew</li>
</ul>"""
self.assertTagInHTML('<li class="important really">', haystack, allow_extra_attrs=True)
self.assertTagInHTML('<li>', haystack, count=3, allow_extra_attrs=True)
with self.assertRaises(AssertionError):
self.assertTagInHTML('<li class="normal" lang="en">', haystack, allow_extra_attrs=True)
with self.assertRaises(AssertionError):
self.assertTagInHTML('<li class="important really">', haystack, count=2, allow_extra_attrs=True)
def test_assert_tag_in_template_script(self):
haystack = """<html>
<script type="text/template">