made all test cases pass and small refactoring of the user activity page

3 files changed, 20 insertions, 12 deletions

diff --git a/askbot/tests/badge_tests.py b/askbot/tests/badge_tests.py
index c184db6f..91c6b349 100644
--- a/askbot/tests/badge_tests.py
+++ b/askbot/tests/badge_tests.py
@@ -1,5 +1,6 @@
 import datetime
 from django.conf import settings as django_settings
+from django.core.urlresolvers import reverse
 from django.test.client import Client
 from askbot.tests.utils import AskbotTestCase
 from askbot.conf import settings
@@ -502,6 +503,6 @@ class BadgeTests(AskbotTestCase):
         self.u1.save()
         self.assert_have_badge('enthusiast', self.u1, 0)
         self.client.login(method = 'force', user_id = self.u1.id)
-        self.client.get('/' + django_settings.ASKBOT_URL)
+        self.client.get(reverse('questions'))
         self.assert_have_badge('enthusiast', self.u1, 1)
 
diff --git a/askbot/tests/post_model_tests.py b/askbot/tests/post_model_tests.py
index 031909fb..cad58388 100644
--- a/askbot/tests/post_model_tests.py
+++ b/askbot/tests/post_model_tests.py
@@ -126,17 +126,21 @@ class PostModelTests(AskbotTestCase):
         th.title = 'lala-x-lala'
         p = Post(id=3, post_type='question')
         p._thread_cache = th  # cannot assign non-Thread instance directly
-        self.assertEqual('/question/3/lala-x-lala/', p.get_absolute_url(thread=th))
+        expected_url = urlresolvers.reverse('question', kwargs={'id': 3}) \
+                                                                + th.title + '/'
+        self.assertEqual(expected_url, p.get_absolute_url(thread=th))
         self.assertTrue(p._thread_cache is th)
-        self.assertEqual('/question/3/lala-x-lala/', p.get_absolute_url(thread=th))
+        self.assertEqual(expected_url, p.get_absolute_url(thread=th))
 
     def test_cached_get_absolute_url_2(self):
         p = Post(id=3, post_type='question')
         th = lambda:1
         th.title = 'lala-x-lala'
-        self.assertEqual('/question/3/lala-x-lala/', p.get_absolute_url(thread=th))
+        expected_url = urlresolvers.reverse('question', kwargs={'id': 3}) \
+                                                                + th.title + '/'
+        self.assertEqual(expected_url, p.get_absolute_url(thread=th))
         self.assertTrue(p._thread_cache is th)
-        self.assertEqual('/question/3/lala-x-lala/', p.get_absolute_url(thread=th))
+        self.assertEqual(expected_url, p.get_absolute_url(thread=th))
 
     def test_get_moderators_with_groups(self):
         groups_enabled_backup = askbot_settings.GROUPS_ENABLED
diff --git a/askbot/tests/skin_tests.py b/askbot/tests/skin_tests.py
index 5226e6d6..8499ab70 100644
--- a/askbot/tests/skin_tests.py
+++ b/askbot/tests/skin_tests.py
@@ -1,20 +1,23 @@
 import os
 import shutil
+import tempfile
 from django.test import TestCase
 from django.core.files.uploadedfile import UploadedFile
 from django.conf import settings as django_settings
 from askbot.conf import settings as askbot_settings
-from askbot.utils.path import mkdir_p
 from askbot.skins import utils as skin_utils
+from askbot.utils.path import mkdir_p
 import askbot
 
 class SkinTests(TestCase):
 
     def setUp(self):
         #create dummy skin
+        self.temp_dir = tempfile.mkdtemp()
+        self.skins_dir_backup = getattr(django_settings, 'ASKBOT_EXTRA_SKINS_DIR', None)
+        setattr(django_settings, 'ASKBOT_EXTRA_SKINS_DIR', self.temp_dir)
         skin_image_dir = os.path.join(
-                            askbot.get_install_directory(),
-                            'skins',
+                            self.temp_dir,
                             'test_skin',
                             'media',
                             'images'
@@ -31,12 +34,12 @@ class SkinTests(TestCase):
     def tearDown(self):
         #delete the dummy skin
         test_skin_dir = os.path.join(
-                            askbot.get_install_directory(),
-                            'skins',
+                            self.temp_dir,
                             'test_skin'
                         )
-        shutil.rmtree(test_skin_dir)
+        shutil.rmtree(self.temp_dir)
         askbot_settings.update('ASKBOT_DEFAULT_SKIN', 'default')
+        django_settings.ASKBOT_EXTRA_SKINS_DIR = self.skins_dir_backup
 
     def assert_default_logo_in_skin(self, skin_name):
         url = skin_utils.get_media_url(askbot_settings.SITE_LOGO_URL)
@@ -62,5 +65,5 @@ class SkinTests(TestCase):
         askbot_settings.update('SITE_LOGO_URL', new_logo)
         logo_url = askbot_settings.SITE_LOGO_URL
         self.assertTrue(logo_url.startswith(django_settings.MEDIA_URL))
-        response = self.client.get(logo_url)
+        response = self.client.get(logo_url, follow=True)
         self.assertTrue(response.status_code == 200)