diff options
| -rw-r--r-- | askbot/conf/access_control.py | 4 | ||||
| -rw-r--r-- | askbot/setup_templates/settings.py.mustache | 1 | ||||
| -rw-r--r-- | askbot/startup_procedures.py | 1 | ||||
| -rw-r--r-- | askbot/tests/page_load_tests.py | 4 | ||||
| -rw-r--r-- | askbot/tests/permission_assertion_tests.py | 6 |
5 files changed, 9 insertions, 7 deletions
diff --git a/askbot/conf/access_control.py b/askbot/conf/access_control.py index 88bedfed..cd2364b5 100644 --- a/askbot/conf/access_control.py +++ b/askbot/conf/access_control.py @@ -14,9 +14,7 @@ settings.register( ACCESS_CONTROL, 'ASKBOT_CLOSED_FORUM_MODE', default = False, - description=_('Support mode where only registered users can access the forum'), - help_text=_('to activate this permanently use ASKBOT_CLOSED_FORUM_MODE ' - 'in your settings.py') + description=_('Allow only registered user to access the forum'), ) ) diff --git a/askbot/setup_templates/settings.py.mustache b/askbot/setup_templates/settings.py.mustache index 081f37fa..368c0564 100644 --- a/askbot/setup_templates/settings.py.mustache +++ b/askbot/setup_templates/settings.py.mustache @@ -101,6 +101,7 @@ MIDDLEWARE_CLASSES = ( #below is askbot stuff for this tuple 'askbot.middleware.anon_user.ConnectToSessionMessagesMiddleware', + 'askbot.middleware.forum_mode.ForumModeMiddleware', 'askbot.middleware.pagesize.QuestionsPageSizeMiddleware', 'askbot.middleware.cancel.CancelActionMiddleware', 'django.middleware.transaction.TransactionMiddleware', diff --git a/askbot/startup_procedures.py b/askbot/startup_procedures.py index bf988881..b6a97f22 100644 --- a/askbot/startup_procedures.py +++ b/askbot/startup_procedures.py @@ -76,6 +76,7 @@ def test_middleware(): 'django.middleware.common.CommonMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware', 'askbot.middleware.anon_user.ConnectToSessionMessagesMiddleware', + 'askbot.middleware.forum_mode.ForumModeMiddleware', 'askbot.middleware.pagesize.QuestionsPageSizeMiddleware', 'askbot.middleware.cancel.CancelActionMiddleware', 'django.middleware.transaction.TransactionMiddleware', diff --git a/askbot/tests/page_load_tests.py b/askbot/tests/page_load_tests.py index 285d8bc7..acf81279 100644 --- a/askbot/tests/page_load_tests.py +++ b/askbot/tests/page_load_tests.py @@ -128,6 +128,10 @@ class PageLoadTestCase(AskbotTestCase): status_code=status_code, template='about.html') self.try_url( + 'ask', + status_code=status_code, + template='about.html') + self.try_url( 'privacy', status_code=status_code, template='privacy.html') diff --git a/askbot/tests/permission_assertion_tests.py b/askbot/tests/permission_assertion_tests.py index 5b7d087b..b83d7827 100644 --- a/askbot/tests/permission_assertion_tests.py +++ b/askbot/tests/permission_assertion_tests.py @@ -1611,12 +1611,10 @@ class ClosedForumTests(utils.AskbotTestCase): @skipIf('askbot.middleware.forum_mode.ForumModeMiddleware' \ not in settings.MIDDLEWARE_CLASSES, 'no ForumModeMiddleware set') - def test_authentificated_access(self): + def test_authenticated_access(self): self.client.login(username=self.other_user.username, password=self.password) response = self.client.get(self.test_url) - self.assertEquals(response.status_code, 302) - self.assertTrue(self.redirect_to not in response['Location']) - self.assertTrue(self.test_url in response['Location']) + self.assertEquals(response.status_code, 200) def tearDown(self): askbot_settings.ASKBOT_CLOSED_FORUM_MODE = False |