From f4ebd701f239d4392ba8409125406eca514cbfb5 Mon Sep 17 00:00:00 2001 From: Malcolm Tredinnick Date: Sat, 11 Sep 2010 17:55:08 +0000 Subject: [PATCH] [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 --- tests/regressiontests/admin_views/tests.py | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/tests/regressiontests/admin_views/tests.py b/tests/regressiontests/admin_views/tests.py index f76765236e..374c2aa603 100644 --- a/tests/regressiontests/admin_views/tests.py +++ b/tests/regressiontests/admin_views/tests.py @@ -2206,16 +2206,19 @@ try: self.assertContains(response, "

Built-in tags

", count=2) # A builtin tag exists in both the index and detail - self.assertContains(response, '

autoescape

') - self.assertContains(response, '
  • autoescape
  • ') + self.assertContains(response, '

    autoescape

    ') + self.assertContains(response, '
  • autoescape
  • ') # An app tag exists in both the index and detail - # The builtin tag group exists + self.assertContains(response, '

    get_flatpages

    ') + self.assertContains(response, '
  • get_flatpages
  • ') + + # The admin list tag group exists self.assertContains(response, "

    admin_list

    ", count=2) - # A builtin tag exists in both the index and detail - self.assertContains(response, '

    autoescape

    ') - self.assertContains(response, '
  • admin_actions
  • ') + # An admin list tag exists in both the index and detail + self.assertContains(response, '

    admin_actions

    ') + self.assertContains(response, '
  • admin_actions
  • ') def test_filters(self): response = self.client.get('/test_admin/admin/doc/filters/') @@ -2224,8 +2227,8 @@ try: self.assertContains(response, "

    Built-in filters

    ", count=2) # A builtin filter exists in both the index and detail - self.assertContains(response, '

    add

    ') - self.assertContains(response, '
  • add
  • ') + self.assertContains(response, '

    add

    ') + self.assertContains(response, '
  • add
  • ') except ImportError: pass