[1.2.X] Adjust AdminDocTests to run after r13728. Also match comments to tests and add test that was there in comment form only.Refs #3695.

Backport of r13737 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13750 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Malcolm Tredinnick 2010-09-11 17:55:08 +00:00
parent f140436e3a
commit f4ebd701f2
1 changed files with 11 additions and 8 deletions

View File

@ -2206,16 +2206,19 @@ try:
self.assertContains(response, "<h2>Built-in tags</h2>", count=2)
# A builtin tag exists in both the index and detail
self.assertContains(response, '<h3 id="autoescape">autoescape</h3>')
self.assertContains(response, '<li><a href="#autoescape">autoescape</a></li>')
self.assertContains(response, '<h3 id="built_in-autoescape">autoescape</h3>')
self.assertContains(response, '<li><a href="#built_in-autoescape">autoescape</a></li>')
# An app tag exists in both the index and detail
# The builtin tag group exists
self.assertContains(response, '<h3 id="flatpages-get_flatpages">get_flatpages</h3>')
self.assertContains(response, '<li><a href="#flatpages-get_flatpages">get_flatpages</a></li>')
# The admin list tag group exists
self.assertContains(response, "<h2>admin_list</h2>", count=2)
# A builtin tag exists in both the index and detail
self.assertContains(response, '<h3 id="autoescape">autoescape</h3>')
self.assertContains(response, '<li><a href="#admin_actions">admin_actions</a></li>')
# An admin list tag exists in both the index and detail
self.assertContains(response, '<h3 id="admin_list-admin_actions">admin_actions</h3>')
self.assertContains(response, '<li><a href="#admin_list-admin_actions">admin_actions</a></li>')
def test_filters(self):
response = self.client.get('/test_admin/admin/doc/filters/')
@ -2224,8 +2227,8 @@ try:
self.assertContains(response, "<h2>Built-in filters</h2>", count=2)
# A builtin filter exists in both the index and detail
self.assertContains(response, '<h3 id="add">add</h3>')
self.assertContains(response, '<li><a href="#add">add</a></li>')
self.assertContains(response, '<h3 id="built_in-add">add</h3>')
self.assertContains(response, '<li><a href="#built_in-add">add</a></li>')
except ImportError:
pass