Feature #6342: Fix tests for Django 1.4 version.

aldarund · Feb 9, 2012 · cd96df0 · cd96df0
1 parent ee8d551
commit cd96df0
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/testproject/core/tests/test_ui.py b/testproject/core/tests/test_ui.py
@@ -2,6 +2,7 @@
 
 from decimal import Decimal
 
+from django import VERSION
 from django.conf import settings as django_settings
 from django.contrib.auth.models import User
 from django.core.urlresolvers import reverse
@@ -142,7 +143,13 @@ def setUp(self):
         self.edit_url = reverse('admin:setman_settings_changelist')
 
     def test_admin(self):
-        relative = lambda url: url.replace(self.admin_url, '')
+        if VERSION[:2] == (1, 3):
+            relative = lambda url: url.replace(self.admin_url, '')
+            add_url = relative(self.add_url)
+            edit_url = relative(self.edit_url)
+        else:
+            add_url = self.add_url
+            edit_url = self.edit_url
 
         response = self.client.get(self.admin_url)
         self.assertNotContains(response, 'Settings Manager')
@@ -153,16 +160,14 @@ def test_admin(self):
 
         self.assertContains(response, 'Settings Manager')
         self.assertContains(
-            response, '<a href="%s">Settings</a>' % relative(self.edit_url)
+            response, '<a href="%s">Settings</a>' % edit_url
         )
         self.assertNotContains(
-            response, '<a href="%s" class="addlink">Add</a>' % \
-            relative(self.add_url)
+            response, '<a href="%s" class="addlink">Add</a>' % add_url
         )
         self.assertContains(
             response,
-            '<a href="%s" class="changelink">Change</a>' % \
-            relative(self.edit_url)
+            '<a href="%s" class="changelink">Change</a>' % edit_url
         )
 
     def test_admin_edit(self):