Merge branch 'master' into django1.4

3 files changed, 14 insertions, 15 deletions

diff --git a/askbot/tests/db_api_tests.py b/askbot/tests/db_api_tests.py
index 8a6ffe0e..232b847a 100644
--- a/askbot/tests/db_api_tests.py
+++ b/askbot/tests/db_api_tests.py
@@ -15,7 +15,6 @@ from askbot.tests.utils import with_settings
 from askbot import models
 from askbot import const
 from askbot.conf import settings as askbot_settings
-from askbot.models.tag import get_global_group
 import datetime
 
 class DBApiTests(AskbotTestCase):
@@ -186,6 +185,8 @@ class DBApiTests(AskbotTestCase):
         self.assertTrue(saved_question.thread.answer_count == 1)
 
     def test_unused_tag_is_auto_deleted(self):
+        import pdb
+        pdb.set_trace()
         self.user.retag_question(self.question, tags='one-tag')
         tag = models.Tag.objects.get(name='one-tag')
         self.assertEquals(tag.used_count, 1)
@@ -515,11 +516,11 @@ class GroupTests(AskbotTestCase):
 
     def test_global_group_name_setting_changes_group_name(self):
         askbot_settings.update('GLOBAL_GROUP_NAME', 'all-people')
-        group = get_global_group()
+        group = models.Group.objects.get_global_group()
         self.assertEqual(group.name, 'all-people')
 
     def test_ask_global_group_by_id_works(self):
-        group = get_global_group()
+        group = models.Group.objects.get_global_group()
         q = self.post_question(user=self.u1, group_id=group.id)
         self.assertEqual(q.groups.count(), 2)
         self.assertEqual(q.groups.filter(name=group.name).exists(), True)
@@ -601,7 +602,7 @@ class GroupTests(AskbotTestCase):
 
         data['thread'].make_public(recursive=True)
 
-        global_group = get_global_group()
+        global_group = models.Group.objects.get_global_group()
         groups = [global_group, private_group, self.u1.get_personal_group()]
         self.assertObjectGroupsEqual(data['thread'], groups)
         self.assertObjectGroupsEqual(data['question'], groups)
@@ -616,7 +617,7 @@ class GroupTests(AskbotTestCase):
         thread = data['thread']
         thread.add_to_groups([private_group], recursive=True)
 
-        global_group = get_global_group()
+        global_group = models.Group.objects.get_global_group()
         groups = [global_group, private_group, self.u1.get_personal_group()]
         self.assertObjectGroupsEqual(thread, groups)
         self.assertObjectGroupsEqual(data['question'], groups)
diff --git a/askbot/tests/question_views_tests.py b/askbot/tests/question_views_tests.py
index b1836f9e..223f65f6 100644
--- a/askbot/tests/question_views_tests.py
+++ b/askbot/tests/question_views_tests.py
@@ -3,7 +3,6 @@ from askbot.conf import settings as askbot_settings
 from askbot import const
 from askbot.tests.utils import AskbotTestCase
 from askbot import models
-from askbot.models.tag import get_global_group
 from django.core.urlresolvers import reverse
 
 
@@ -36,7 +35,7 @@ class PrivateQuestionViewsTests(AskbotTestCase):
         self.assertTrue(const.POST_STATUS['private'] in title)
         question = models.Thread.objects.get(id=1)
         self.assertEqual(question.title, self.qdata['title'])
-        self.assertFalse(get_global_group() in set(question.groups.all()))
+        self.assertFalse(models.Group.objects.get_global_group() in set(question.groups.all()))
 
         #private question is not accessible to unauthorized users
         self.client.logout()
@@ -67,7 +66,7 @@ class PrivateQuestionViewsTests(AskbotTestCase):
         response2 = self.client.get(question.get_absolute_url())
         dom = BeautifulSoup(response2.content)
         title = dom.find('h1').text
-        self.assertTrue(get_global_group() in set(question.groups.all()))
+        self.assertTrue(models.Group.objects.get_global_group() in set(question.groups.all()))
         self.assertEqual(title, self.qdata['title'])
 
         self.client.logout()
@@ -88,7 +87,7 @@ class PrivateQuestionViewsTests(AskbotTestCase):
         response2 = self.client.get(question.get_absolute_url())
         dom = BeautifulSoup(response2.content)
         title = dom.find('h1').text
-        self.assertFalse(get_global_group() in set(question.groups.all()))
+        self.assertFalse(models.Group.objects.get_global_group() in set(question.groups.all()))
         self.assertTrue(const.POST_STATUS['private'] in title)
 
     def test_private_checkbox_is_on_when_editing_private_question(self):
@@ -136,7 +135,7 @@ class PrivateAnswerViewsTests(AskbotTestCase):
             data={'text': 'some answer text', 'post_privately': 'checked'}
         )
         answer = self.question.thread.get_answers(user=self.user)[0]
-        self.assertFalse(get_global_group() in set(answer.groups.all()))
+        self.assertFalse(models.Group.objects.get_global_group() in set(answer.groups.all()))
         self.client.logout()
 
         user2 = self.create_user('user2')
@@ -182,7 +181,7 @@ class PrivateAnswerViewsTests(AskbotTestCase):
             data={'text': 'edited answer text', 'select_revision': 'false'}
         )
         answer = self.reload_object(answer)
-        self.assertTrue(get_global_group() in answer.groups.all())
+        self.assertTrue(models.Group.objects.get_global_group() in answer.groups.all())
         self.client.logout()
         response = self.client.get(self.question.get_absolute_url())
         self.assertTrue('edited answer text' in response.content)
@@ -200,7 +199,7 @@ class PrivateAnswerViewsTests(AskbotTestCase):
         )
         #check that answer is not visible to the "everyone" group
         answer = self.reload_object(answer)
-        self.assertFalse(get_global_group() in answer.groups.all())
+        self.assertFalse(models.Group.objects.get_global_group() in answer.groups.all())
         #check that countent is not seen by an anonymous user
         self.client.logout()
         response = self.client.get(self.question.get_absolute_url())
diff --git a/askbot/tests/thread_model_tests.py b/askbot/tests/thread_model_tests.py
index baf51e8e..33a2055c 100644
--- a/askbot/tests/thread_model_tests.py
+++ b/askbot/tests/thread_model_tests.py
@@ -1,7 +1,6 @@
 from askbot.tests.utils import AskbotTestCase
 from askbot.conf import settings as askbot_settings
 from askbot import models
-from askbot.models.tag import get_global_group
 import django.core.mail
 from django.core.urlresolvers import reverse
 
@@ -63,7 +62,7 @@ class ThreadModelTestsWithGroupsEnabled(AskbotTestCase):
     def test_answer_to_private_question_is_not_globally_visible(self):
         question = self.post_question(user=self.admin, is_private=True)
         answer = self.post_answer(question=question, user=self.admin, is_private=False)
-        global_group = get_global_group()
+        global_group = models.Group.objects.get_global_group()
         self.assertEqual(
             global_group in set(answer.groups.all()),
             False
@@ -74,7 +73,7 @@ class ThreadModelTestsWithGroupsEnabled(AskbotTestCase):
         question = self.post_question(user=self.user, group_id=self.group.id)
         #answer posted by a group member
         answer = self.post_answer(question=question, user=self.admin, is_private=False)
-        global_group = get_global_group()
+        global_group = models.Group.objects.get_global_group()
         self.assertEqual(
             global_group in set(answer.groups.all()),
             False