mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-06-01 09:39:12 +00:00
Code Issues 32 Releases Wiki Activity

Refs #34657 -- Made assertInHTML() use unparsed needle in error messages.

Browse Source
This commit is contained in:
Chinmoy Chakraborty 2023-09-29 09:48:45 +02:00 committed by Mariusz Felisiak
parent 6ad0dbc8d9
commit e99c7d8847
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -196,6 +196,7 @@ answer newbie questions, and generally made Django that much better:
charly.wilhelm@gmail.com charly.wilhelm@gmail.com
Chason Chaffin <chason@gmail.com> Chason Chaffin <chason@gmail.com>
Cheng Zhang Cheng Zhang
Chinmoy Chakraborty <chinmoy12c@gmail.com>
Chris Adams Chris Adams
Chris Beaven <smileychris@gmail.com> Chris Beaven <smileychris@gmail.com>
Chris Bennett <chrisrbennett@yahoo.com> Chris Bennett <chrisrbennett@yahoo.com>

6
django/test/testcases.py
View File

@ -873,13 +873,13 @@ class SimpleTestCase(unittest.TestCase):
self.fail(self._formatMessage(msg, standardMsg)) self.fail(self._formatMessage(msg, standardMsg))
def assertInHTML(self, needle, haystack, count=None, msg_prefix=""): def assertInHTML(self, needle, haystack, count=None, msg_prefix=""):
needle = assert_and_parse_html( parsed_needle = assert_and_parse_html(
self, needle, None, "First argument is not valid HTML:" self, needle, None, "First argument is not valid HTML:"
) )
haystack = assert_and_parse_html( parsed_haystack = assert_and_parse_html(
self, haystack, None, "Second argument is not valid HTML:" self, haystack, None, "Second argument is not valid HTML:"
) )
real_count = haystack.count(needle) real_count = parsed_haystack.count(parsed_needle)
if count is not None: if count is not None:
self.assertEqual( self.assertEqual(
real_count, real_count,

7
tests/test_utils/tests.py
View File

@ -983,6 +983,13 @@ class HTMLEqualTests(SimpleTestCase):
) )
class InHTMLTests(SimpleTestCase):
def test_needle_msg(self):
msg = "False is not true : Couldn't find '<b>Hello</b>' in response"
with self.assertRaisesMessage(AssertionError, msg):
self.assertInHTML("<b>Hello</b>", "<p>Test</p>")
class JSONEqualTests(SimpleTestCase): class JSONEqualTests(SimpleTestCase):
def test_simple_equal(self): def test_simple_equal(self):
json1 = '{"attr1": "foo", "attr2":"baz"}' json1 = '{"attr1": "foo", "attr2":"baz"}'