Skip to content

E
edx-platform
Commit cfd16207 by Calen Pennington
Options

Merge pull request #12630 from cpennington/dont-leak-current-requests-in-tests 

Dont leak current requests in tests
parents f4f33807 97136768
Showing with 299 additions and 278 deletions
cms/djangoapps/contentstore/views/error.py
...@@ -39,9 +39,9 @@ def server_error(request): ...@@ -39,9 +39,9 @@ def server_error(request):
@jsonable_error(404, "Resource not found") @jsonable_error(404, "Resource not found")
def render_404(request): def render_404(request):
return HttpResponseNotFound(render_to_string('404.html', {})) return HttpResponseNotFound(render_to_string('404.html', {}, request=request))
@jsonable_error(500, "The Studio servers encountered an error") @jsonable_error(500, "The Studio servers encountered an error")
def render_500(request): def render_500(request):
return HttpResponseServerError(render_to_string('500.html', {})) return HttpResponseServerError(render_to_string('500.html', {}, request=request))
cms/djangoapps/course_creators/tests/test_views.py
...@@ -5,13 +5,13 @@ Tests course_creators.views.py. ...@@ -5,13 +5,13 @@ Tests course_creators.views.py.
from django.contrib.auth.models import User from django.contrib.auth.models import User
from django.core.exceptions import PermissionDenied from django.core.exceptions import PermissionDenied
from django.test import TestCase, RequestFactory from django.test import TestCase, RequestFactory
from django.core.urlresolvers import reverse
from course_creators.views import add_user_with_status_unrequested, add_user_with_status_granted from course_creators.views import add_user_with_status_unrequested, add_user_with_status_granted
from course_creators.views import get_course_creator_status, update_course_creator_group, user_requested_access from course_creators.views import get_course_creator_status, update_course_creator_group, user_requested_access
import mock import mock
from student.roles import CourseCreatorRole from student.roles import CourseCreatorRole
from student import auth from student import auth
from edxmako.tests import mako_middleware_process_request
class CourseCreatorView(TestCase): class CourseCreatorView(TestCase):
...@@ -73,11 +73,12 @@ class CourseCreatorView(TestCase): ...@@ -73,11 +73,12 @@ class CourseCreatorView(TestCase):
add_user_with_status_unrequested(self.user) add_user_with_status_unrequested(self.user)
self.assertEqual('unrequested', get_course_creator_status(self.user)) self.assertEqual('unrequested', get_course_creator_status(self.user))
request = RequestFactory().get('/') self.client.login(username=self.user.username, password='foo')
request.user = self.user
mako_middleware_process_request(request) # The user_requested_access function renders a template that requires
user_requested_access(self.user) # request-specific information. Use the django TestClient to supply
# the appropriate request context.
self.client.post(reverse('request_course_creator'))
self.assertEqual('pending', get_course_creator_status(self.user)) self.assertEqual('pending', get_course_creator_status(self.user))
def test_user_requested_already_granted(self): def test_user_requested_already_granted(self):
......
cms/envs/common.py
...@@ -312,6 +312,7 @@ simplefilter('ignore') ...@@ -312,6 +312,7 @@ simplefilter('ignore')
################################# Middleware ################################### ################################# Middleware ###################################
MIDDLEWARE_CLASSES = ( MIDDLEWARE_CLASSES = (
'crum.CurrentRequestUserMiddleware',
'request_cache.middleware.RequestCache', 'request_cache.middleware.RequestCache',
'header_control.middleware.HeaderControlMiddleware', 'header_control.middleware.HeaderControlMiddleware',
'django.middleware.cache.UpdateCacheMiddleware', 'django.middleware.cache.UpdateCacheMiddleware',
...@@ -332,7 +333,6 @@ MIDDLEWARE_CLASSES = ( ...@@ -332,7 +333,6 @@ MIDDLEWARE_CLASSES = (
'student.middleware.UserStandingMiddleware', 'student.middleware.UserStandingMiddleware',
'contentserver.middleware.StaticContentServer', 'contentserver.middleware.StaticContentServer',
'crum.CurrentRequestUserMiddleware',
'django.contrib.messages.middleware.MessageMiddleware', 'django.contrib.messages.middleware.MessageMiddleware',
'track.middleware.TrackMiddleware', 'track.middleware.TrackMiddleware',
...@@ -350,9 +350,6 @@ MIDDLEWARE_CLASSES = ( ...@@ -350,9 +350,6 @@ MIDDLEWARE_CLASSES = (
'codejail.django_integration.ConfigureCodeJailMiddleware', 'codejail.django_integration.ConfigureCodeJailMiddleware',
# needs to run after locale middleware (or anything that modifies the request context)
'edxmako.middleware.MakoMiddleware',
# catches any uncaught RateLimitExceptions and returns a 403 instead of a 500 # catches any uncaught RateLimitExceptions and returns a 403 instead of a 500
'ratelimitbackend.middleware.RateLimitMiddleware', 'ratelimitbackend.middleware.RateLimitMiddleware',
......
cms/urls.py
...@@ -76,7 +76,7 @@ urlpatterns += patterns( ...@@ -76,7 +76,7 @@ urlpatterns += patterns(
url(r'^howitworks$', 'howitworks'), url(r'^howitworks$', 'howitworks'),
url(r'^signup$', 'signup', name='signup'), url(r'^signup$', 'signup', name='signup'),
url(r'^signin$', 'login_page', name='login'), url(r'^signin$', 'login_page', name='login'),
url(r'^request_course_creator$', 'request_course_creator'), url(r'^request_course_creator$', 'request_course_creator', name='request_course_creator'),
url(r'^course_team/{}(?:/(?P<email>.+))?$'.format(COURSELIKE_KEY_PATTERN), 'course_team_handler'), url(r'^course_team/{}(?:/(?P<email>.+))?$'.format(COURSELIKE_KEY_PATTERN), 'course_team_handler'),
url(r'^course_info/{}$'.format(settings.COURSE_KEY_PATTERN), 'course_info_handler'), url(r'^course_info/{}$'.format(settings.COURSE_KEY_PATTERN), 'course_info_handler'),
......
common/djangoapps/edxmako/middleware.py → common/djangoapps/edxmako/request_context.py
...@@ -11,29 +11,22 @@ ...@@ -11,29 +11,22 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
#
# This file has been modified by edX.org
"""
Methods for creating RequestContext for using with Mako templates.
"""
import threading
from django.conf import settings from django.conf import settings
from django.template import RequestContext from django.template import RequestContext
from django.template.context import _builtin_context_processors from django.template.context import _builtin_context_processors
from django.utils.module_loading import import_string from django.utils.module_loading import import_string
from util.request import safe_get_host from util.request import safe_get_host
from crum import get_current_request
from request_cache.middleware import RequestCache import request_cache
REQUEST_CONTEXT = threading.local()
class MakoMiddleware(object):
def process_request(self, request):
""" Process the middleware request. """
REQUEST_CONTEXT.request = request
def process_response(self, __, response):
""" Process the middleware response. """
REQUEST_CONTEXT.request = None
return response
def get_template_context_processors(): def get_template_context_processors():
...@@ -45,21 +38,25 @@ def get_template_context_processors(): ...@@ -45,21 +38,25 @@ def get_template_context_processors():
return tuple(import_string(path) for path in context_processors) return tuple(import_string(path) for path in context_processors)
def get_template_request_context(): def get_template_request_context(request=None):
""" """
Returns the template processing context to use for the current request, Returns the template processing context to use for the current request,
or returns None if there is not a current request. or returns None if there is not a current request.
""" """
request = getattr(REQUEST_CONTEXT, "request", None)
if not request: if request is None:
request = get_current_request()
if request is None:
return None return None
request_cache_dict = RequestCache.get_request_cache().data request_cache_dict = request_cache.get_cache('edxmako')
cache_key = "edxmako_request_context" cache_key = "request_context"
if cache_key in request_cache_dict: if cache_key in request_cache_dict:
return request_cache_dict[cache_key] return request_cache_dict[cache_key]
context = RequestContext(request) context = RequestContext(request)
context['is_secure'] = request.is_secure() context['is_secure'] = request.is_secure()
context['site'] = safe_get_host(request) context['site'] = safe_get_host(request)
......
common/djangoapps/edxmako/shortcuts.py
...@@ -19,7 +19,7 @@ import logging ...@@ -19,7 +19,7 @@ import logging
from microsite_configuration import microsite from microsite_configuration import microsite
from edxmako import lookup_template from edxmako import lookup_template
from edxmako.middleware import get_template_request_context from edxmako.request_context import get_template_request_context
from django.conf import settings from django.conf import settings
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
...@@ -111,7 +111,28 @@ def microsite_footer_context_processor(request): ...@@ -111,7 +111,28 @@ def microsite_footer_context_processor(request):
) )
def render_to_string(template_name, dictionary, context=None, namespace='main'): def render_to_string(template_name, dictionary, context=None, namespace='main', request=None):
"""
Render a Mako template to as a string.
The following values are available to all templates:
settings: the django settings object
EDX_ROOT_URL: settings.EDX_ROOT_URL
marketing_link: The :func:`marketing_link` function
is_any_marketing_link_set: The :func:`is_any_marketing_link_set` function
is_marketing_link_set: The :func:`is_marketing_link_set` function
Arguments:
template_name: The name of the template to render. Will be loaded
from the template paths specified in configuration.
dictionary: A dictionary of variables to insert into the template during
rendering.
context: A :class:`~django.template.Context` with values to make
available to the template.
namespace: The Mako namespace to find the named template in.
request: The request to use to construct the RequestContext for rendering
this template. If not supplied, the current request will be used.
"""
# see if there is an override template defined in the microsite # see if there is an override template defined in the microsite
template_name = microsite.get_template_path(template_name) template_name = microsite.get_template_path(template_name)
...@@ -128,7 +149,7 @@ def render_to_string(template_name, dictionary, context=None, namespace='main'): ...@@ -128,7 +149,7 @@ def render_to_string(template_name, dictionary, context=None, namespace='main'):
context_instance['is_marketing_link_set'] = is_marketing_link_set context_instance['is_marketing_link_set'] = is_marketing_link_set
# In various testing contexts, there might not be a current request context. # In various testing contexts, there might not be a current request context.
request_context = get_template_request_context() request_context = get_template_request_context(request)
if request_context: if request_context:
for item in request_context: for item in request_context:
context_dictionary.update(item) context_dictionary.update(item)
...@@ -148,11 +169,11 @@ def render_to_string(template_name, dictionary, context=None, namespace='main'): ...@@ -148,11 +169,11 @@ def render_to_string(template_name, dictionary, context=None, namespace='main'):
return template.render_unicode(**context_dictionary) return template.render_unicode(**context_dictionary)
def render_to_response(template_name, dictionary=None, context_instance=None, namespace='main', **kwargs): def render_to_response(template_name, dictionary=None, context_instance=None, namespace='main', request=None, **kwargs):
""" """
Returns a HttpResponse whose content is filled with the result of calling Returns a HttpResponse whose content is filled with the result of calling
lookup.get_template(args[0]).render with the passed arguments. lookup.get_template(args[0]).render with the passed arguments.
""" """
dictionary = dictionary or {} dictionary = dictionary or {}
return HttpResponse(render_to_string(template_name, dictionary, context_instance, namespace), **kwargs) return HttpResponse(render_to_string(template_name, dictionary, context_instance, namespace, request), **kwargs)
common/djangoapps/edxmako/template.py
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
import edxmako import edxmako
from django.conf import settings from django.conf import settings
from edxmako.middleware import get_template_request_context from edxmako.request_context import get_template_request_context
from edxmako.shortcuts import marketing_link from edxmako.shortcuts import marketing_link
from mako.template import Template as MakoTemplate from mako.template import Template as MakoTemplate
......
common/djangoapps/edxmako/tests.py
...@@ -3,14 +3,14 @@ from mock import patch, Mock ...@@ -3,14 +3,14 @@ from mock import patch, Mock
import unittest import unittest
import ddt import ddt
from request_cache.middleware import RequestCache
from django.conf import settings from django.conf import settings
from django.http import HttpResponse from django.http import HttpResponse
from django.test import TestCase from django.test import TestCase
from django.test.utils import override_settings from django.test.utils import override_settings
from django.test.client import RequestFactory from django.test.client import RequestFactory
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse
import edxmako.middleware from edxmako.request_context import get_template_request_context
from edxmako.middleware import get_template_request_context
from edxmako import add_lookup, LOOKUP from edxmako import add_lookup, LOOKUP
from edxmako.shortcuts import ( from edxmako.shortcuts import (
marketing_link, marketing_link,
...@@ -81,59 +81,76 @@ class AddLookupTests(TestCase): ...@@ -81,59 +81,76 @@ class AddLookupTests(TestCase):
self.assertTrue(dirs[0].endswith('management')) self.assertTrue(dirs[0].endswith('management'))
class MakoMiddlewareTest(TestCase): class MakoRequestContextTest(TestCase):
""" """
Test MakoMiddleware. Test MakoMiddleware.
""" """
def setUp(self): def setUp(self):
super(MakoMiddlewareTest, self).setUp() super(MakoRequestContextTest, self).setUp()
self.middleware = edxmako.middleware.MakoMiddleware()
self.user = UserFactory.create() self.user = UserFactory.create()
self.url = "/" self.url = "/"
self.request = RequestFactory().get(self.url) self.request = RequestFactory().get(self.url)
self.request.user = self.user self.request.user = self.user
self.response = Mock(spec=HttpResponse) self.response = Mock(spec=HttpResponse)
def test_clear_request_context_variable(self): self.addCleanup(RequestCache.clear_request_cache)
def test_with_current_request(self):
"""
Test that if get_current_request returns a request, then get_template_request_context
returns a RequestContext.
"""
with patch('edxmako.request_context.get_current_request', return_value=self.request):
# requestcontext should not be None.
self.assertIsNotNone(get_template_request_context())
def test_without_current_request(self):
"""
Test that if get_current_request returns None, then get_template_request_context
returns None.
"""
with patch('edxmako.request_context.get_current_request', return_value=None):
# requestcontext should be None.
self.assertIsNone(get_template_request_context())
def test_request_context_caching(self):
""" """
Test the global variable requestcontext is cleared correctly Test that the RequestContext is cached in the RequestCache.
when response middleware is called.
""" """
with patch('edxmako.request_context.get_current_request', return_value=None):
# requestcontext should be None, because the cache isn't filled
self.assertIsNone(get_template_request_context())
with patch('edxmako.request_context.get_current_request', return_value=self.request):
# requestcontext should not be None, and should fill the cache
self.assertIsNotNone(get_template_request_context())
self.middleware.process_request(self.request) mock_get_current_request = Mock()
# requestcontext should not be None. with patch('edxmako.request_context.get_current_request', mock_get_current_request):
self.assertIsNotNone(get_template_request_context()) # requestcontext should not be None, because the cache is filled
self.assertIsNotNone(get_template_request_context())
mock_get_current_request.assert_not_called()
self.middleware.process_response(self.request, self.response) RequestCache.clear_request_cache()
# requestcontext should be None.
self.assertIsNone(get_template_request_context()) with patch('edxmako.request_context.get_current_request', return_value=None):
# requestcontext should be None, because the cache isn't filled
self.assertIsNone(get_template_request_context())
@unittest.skipUnless(settings.ROOT_URLCONF == 'lms.urls', 'Test only valid in lms') @unittest.skipUnless(settings.ROOT_URLCONF == 'lms.urls', 'Test only valid in lms')
@patch("edxmako.middleware.REQUEST_CONTEXT") def test_render_to_string_when_no_global_context_lms(self):
def test_render_to_string_when_no_global_context_lms(self, context_mock):
""" """
Test render_to_string() when makomiddleware has not initialized Test render_to_string() when makomiddleware has not initialized
the threadlocal REQUEST_CONTEXT.context. This is meant to run in LMS. the threadlocal REQUEST_CONTEXT.context. This is meant to run in LMS.
""" """
del context_mock.context
self.assertIn("this module is temporarily unavailable", render_to_string("courseware/error-message.html", None)) self.assertIn("this module is temporarily unavailable", render_to_string("courseware/error-message.html", None))
@unittest.skipUnless(settings.ROOT_URLCONF == 'cms.urls', 'Test only valid in cms') @unittest.skipUnless(settings.ROOT_URLCONF == 'cms.urls', 'Test only valid in cms')
@patch("edxmako.middleware.REQUEST_CONTEXT") def test_render_to_string_when_no_global_context_cms(self):
def test_render_to_string_when_no_global_context_cms(self, context_mock):
""" """
Test render_to_string() when makomiddleware has not initialized Test render_to_string() when makomiddleware has not initialized
the threadlocal REQUEST_CONTEXT.context. This is meant to run in CMS. the threadlocal REQUEST_CONTEXT.context. This is meant to run in CMS.
""" """
del context_mock.context
self.assertIn("We're having trouble rendering your component", render_to_string("html_error.html", None)) self.assertIn("We're having trouble rendering your component", render_to_string("html_error.html", None))
def mako_middleware_process_request(request):
"""
Initialize the global RequestContext variable
edxmako.middleware.requestcontext using the request object.
"""
mako_middleware = edxmako.middleware.MakoMiddleware()
mako_middleware.process_request(request)
common/djangoapps/external_auth/tests/test_shib.py
...@@ -14,7 +14,6 @@ from django.test.utils import override_settings ...@@ -14,7 +14,6 @@ from django.test.utils import override_settings
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse
from django.contrib.auth.models import AnonymousUser, User from django.contrib.auth.models import AnonymousUser, User
from importlib import import_module from importlib import import_module
from edxmako.tests import mako_middleware_process_request
from external_auth.models import ExternalAuthMap from external_auth.models import ExternalAuthMap
from external_auth.views import ( from external_auth.views import (
shib_login, course_specific_login, course_specific_register, _flatten_to_ascii shib_login, course_specific_login, course_specific_register, _flatten_to_ascii
...@@ -97,18 +96,11 @@ class ShibSPTest(CacheIsolationTestCase): ...@@ -97,18 +96,11 @@ class ShibSPTest(CacheIsolationTestCase):
Tests that we get the error page when there is no REMOTE_USER Tests that we get the error page when there is no REMOTE_USER
or Shib-Identity-Provider in request.META or Shib-Identity-Provider in request.META
""" """
no_remote_user_request = self.request_factory.get('/shib-login') no_remote_user_response = self.client.get(reverse('shib-login'), HTTP_SHIB_IDENTITY_PROVIDER=IDP)
no_remote_user_request.META.update({'Shib-Identity-Provider': IDP})
no_remote_user_request.user = AnonymousUser()
mako_middleware_process_request(no_remote_user_request)
no_remote_user_response = shib_login(no_remote_user_request)
self.assertEqual(no_remote_user_response.status_code, 403) self.assertEqual(no_remote_user_response.status_code, 403)
self.assertIn("identity server did not return your ID information", no_remote_user_response.content) self.assertIn("identity server did not return your ID information", no_remote_user_response.content)
no_idp_request = self.request_factory.get('/shib-login') no_idp_response = self.client.get(reverse('shib-login'), HTTP_REMOTE_USER=REMOTE_USER)
no_idp_request.META.update({'REMOTE_USER': REMOTE_USER})
no_idp_response = shib_login(no_idp_request)
self.assertEqual(no_idp_response.status_code, 403) self.assertEqual(no_idp_response.status_code, 403)
self.assertIn("identity server did not return your ID information", no_idp_response.content) self.assertIn("identity server did not return your ID information", no_idp_response.content)
...@@ -161,22 +153,22 @@ class ShibSPTest(CacheIsolationTestCase): ...@@ -161,22 +153,22 @@ class ShibSPTest(CacheIsolationTestCase):
for idp in idps: for idp in idps:
for remote_user in remote_users: for remote_user in remote_users:
request = self.request_factory.get('/shib-login')
request.session = import_module(settings.SESSION_ENGINE).SessionStore() # empty session self.client.logout()
request.META.update({'Shib-Identity-Provider': idp,
'REMOTE_USER': remote_user,
'mail': remote_user})
request.user = AnonymousUser()
mako_middleware_process_request(request)
with patch('external_auth.views.AUDIT_LOG') as mock_audit_log: with patch('external_auth.views.AUDIT_LOG') as mock_audit_log:
response = shib_login(request) response = self.client.get(
reverse('shib-login'),
**{
'Shib-Identity-Provider': idp,
'mail': remote_user,
'REMOTE_USER': remote_user,
}
)
audit_log_calls = mock_audit_log.method_calls audit_log_calls = mock_audit_log.method_calls
if idp == "https://idp.stanford.edu/" and remote_user == 'withmap@stanford.edu': if idp == "https://idp.stanford.edu/" and remote_user == 'withmap@stanford.edu':
self.assertIsInstance(response, HttpResponseRedirect) self.assertRedirects(response, '/dashboard')
self.assertEqual(request.user, user_w_map) self.assertEquals(int(self.client.session['_auth_user_id']), user_w_map.id)
self.assertEqual(response['Location'], '/dashboard')
# verify logging: # verify logging:
self.assertEquals(len(audit_log_calls), 2) self.assertEquals(len(audit_log_calls), 2)
self._assert_shib_login_is_logged(audit_log_calls[0], remote_user) self._assert_shib_login_is_logged(audit_log_calls[0], remote_user)
...@@ -198,9 +190,8 @@ class ShibSPTest(CacheIsolationTestCase): ...@@ -198,9 +190,8 @@ class ShibSPTest(CacheIsolationTestCase):
# self.assertEquals(remote_user, args[1]) # self.assertEquals(remote_user, args[1])
elif idp == "https://idp.stanford.edu/" and remote_user == 'womap@stanford.edu': elif idp == "https://idp.stanford.edu/" and remote_user == 'womap@stanford.edu':
self.assertIsNotNone(ExternalAuthMap.objects.get(user=user_wo_map)) self.assertIsNotNone(ExternalAuthMap.objects.get(user=user_wo_map))
self.assertIsInstance(response, HttpResponseRedirect) self.assertRedirects(response, '/dashboard')
self.assertEqual(request.user, user_wo_map) self.assertEquals(int(self.client.session['_auth_user_id']), user_wo_map.id)
self.assertEqual(response['Location'], '/dashboard')
# verify logging: # verify logging:
self.assertEquals(len(audit_log_calls), 2) self.assertEquals(len(audit_log_calls), 2)
self._assert_shib_login_is_logged(audit_log_calls[0], remote_user) self._assert_shib_login_is_logged(audit_log_calls[0], remote_user)
...@@ -313,8 +304,7 @@ class ShibSPTest(CacheIsolationTestCase): ...@@ -313,8 +304,7 @@ class ShibSPTest(CacheIsolationTestCase):
Uses django test client for its session support Uses django test client for its session support
""" """
# First we pop the registration form # First we pop the registration form
client = DjangoTestClient() self.client.get(path='/shib-login/', data={}, follow=False, **identity)
response1 = client.get(path='/shib-login/', data={}, follow=False, **identity)
# Then we have the user answer the registration form # Then we have the user answer the registration form
# These are unicode because request.POST returns unicode # These are unicode because request.POST returns unicode
postvars = {'email': u'post_email@stanford.edu', postvars = {'email': u'post_email@stanford.edu',
...@@ -323,16 +313,10 @@ class ShibSPTest(CacheIsolationTestCase): ...@@ -323,16 +313,10 @@ class ShibSPTest(CacheIsolationTestCase):
'name': u'post_náme', 'name': u'post_náme',
'terms_of_service': u'true', 'terms_of_service': u'true',
'honor_code': u'true'} 'honor_code': u'true'}
# use RequestFactory instead of TestClient here because we want access to request.user
request2 = self.request_factory.post('/create_account', data=postvars)
request2.session = client.session
request2.user = AnonymousUser()
mako_middleware_process_request(request2)
with patch('student.views.AUDIT_LOG') as mock_audit_log: with patch('student.views.AUDIT_LOG') as mock_audit_log:
_response2 = create_account(request2) self.client.post('/create_account', data=postvars)
user = request2.user
mail = identity.get('mail') mail = identity.get('mail')
# verify logging of login happening during account creation: # verify logging of login happening during account creation:
...@@ -355,6 +339,8 @@ class ShibSPTest(CacheIsolationTestCase): ...@@ -355,6 +339,8 @@ class ShibSPTest(CacheIsolationTestCase):
self.assertEquals(u'post_username', args[1]) self.assertEquals(u'post_username', args[1])
self.assertEquals(u'test_user@stanford.edu', args[2].external_id) self.assertEquals(u'test_user@stanford.edu', args[2].external_id)
user = User.objects.get(id=self.client.session['_auth_user_id'])
# check that the created user has the right email, either taken from shib or user input # check that the created user has the right email, either taken from shib or user input
if mail: if mail:
self.assertEqual(user.email, mail) self.assertEqual(user.email, mail)
...@@ -375,10 +361,10 @@ class ShibSPTest(CacheIsolationTestCase): ...@@ -375,10 +361,10 @@ class ShibSPTest(CacheIsolationTestCase):
if sn_empty and given_name_empty: if sn_empty and given_name_empty:
self.assertEqual(profile.name, postvars['name']) self.assertEqual(profile.name, postvars['name'])
else: else:
self.assertEqual(profile.name, request2.session['ExternalAuthMap'].external_name) self.assertEqual(profile.name, self.client.session['ExternalAuthMap'].external_name)
self.assertNotIn(u';', profile.name) self.assertNotIn(u';', profile.name)
else: else:
self.assertEqual(profile.name, request2.session['ExternalAuthMap'].external_name) self.assertEqual(profile.name, self.client.session['ExternalAuthMap'].external_name)
self.assertEqual(profile.name, identity.get('displayName').decode('utf-8')) self.assertEqual(profile.name, identity.get('displayName').decode('utf-8'))
......
common/djangoapps/external_auth/tests/test_ssl.py
...@@ -5,6 +5,7 @@ of the external_auth app. ...@@ -5,6 +5,7 @@ of the external_auth app.
import copy import copy
import unittest import unittest
from contextlib import contextmanager
from django.conf import settings from django.conf import settings
from django.contrib.auth import SESSION_KEY from django.contrib.auth import SESSION_KEY
from django.contrib.auth.models import AnonymousUser, User from django.contrib.auth.models import AnonymousUser, User
...@@ -13,10 +14,9 @@ from django.core.urlresolvers import reverse ...@@ -13,10 +14,9 @@ from django.core.urlresolvers import reverse
from django.test.client import Client from django.test.client import Client
from django.test.client import RequestFactory from django.test.client import RequestFactory
from django.test.utils import override_settings from django.test.utils import override_settings
from edxmako.middleware import MakoMiddleware
from external_auth.models import ExternalAuthMap from external_auth.models import ExternalAuthMap
import external_auth.views import external_auth.views
from mock import Mock from mock import Mock, patch
from student.models import CourseEnrollment from student.models import CourseEnrollment
from student.roles import CourseStaffRole from student.roles import CourseStaffRole
...@@ -48,6 +48,7 @@ class SSLClientTest(ModuleStoreTestCase): ...@@ -48,6 +48,7 @@ class SSLClientTest(ModuleStoreTestCase):
USER_EMAIL = 'test_user_ssl@EDX.ORG' USER_EMAIL = 'test_user_ssl@EDX.ORG'
MOCK_URL = '/' MOCK_URL = '/'
@contextmanager
def _create_ssl_request(self, url): def _create_ssl_request(self, url):
"""Creates a basic request for SSL use.""" """Creates a basic request for SSL use."""
request = self.factory.get(url) request = self.factory.get(url)
...@@ -56,9 +57,11 @@ class SSLClientTest(ModuleStoreTestCase): ...@@ -56,9 +57,11 @@ class SSLClientTest(ModuleStoreTestCase):
middleware = SessionMiddleware() middleware = SessionMiddleware()
middleware.process_request(request) middleware.process_request(request)
request.session.save() request.session.save()
MakoMiddleware().process_request(request)
return request
with patch('edxmako.request_context.get_current_request', return_value=request):
yield request
@contextmanager
def _create_normal_request(self, url): def _create_normal_request(self, url):
"""Creates sessioned request without SSL headers""" """Creates sessioned request without SSL headers"""
request = self.factory.get(url) request = self.factory.get(url)
...@@ -66,8 +69,9 @@ class SSLClientTest(ModuleStoreTestCase): ...@@ -66,8 +69,9 @@ class SSLClientTest(ModuleStoreTestCase):
middleware = SessionMiddleware() middleware = SessionMiddleware()
middleware.process_request(request) middleware.process_request(request)
request.session.save() request.session.save()
MakoMiddleware().process_request(request)
return request with patch('edxmako.request_context.get_current_request', return_value=request):
yield request
def setUp(self): def setUp(self):
"""Setup test case by adding primary user.""" """Setup test case by adding primary user."""
...@@ -82,8 +86,8 @@ class SSLClientTest(ModuleStoreTestCase): ...@@ -82,8 +86,8 @@ class SSLClientTest(ModuleStoreTestCase):
Validate that an SSL login creates an eamap user and Validate that an SSL login creates an eamap user and
redirects them to the signup page. redirects them to the signup page.
""" """
with self._create_ssl_request('/') as request:
response = external_auth.views.ssl_login(self._create_ssl_request('/')) response = external_auth.views.ssl_login(request)
# Response should contain template for signup form, eamap should have user, and internal # Response should contain template for signup form, eamap should have user, and internal
# auth should not have a user # auth should not have a user
...@@ -122,8 +126,8 @@ class SSLClientTest(ModuleStoreTestCase): ...@@ -122,8 +126,8 @@ class SSLClientTest(ModuleStoreTestCase):
Test IMMEDIATE_SIGNUP feature flag and ensure the user account is automatically created Test IMMEDIATE_SIGNUP feature flag and ensure the user account is automatically created
and the user is redirected to slash. and the user is redirected to slash.
""" """
with self._create_ssl_request('/') as request:
external_auth.views.ssl_login(self._create_ssl_request('/')) external_auth.views.ssl_login(request)
# Assert our user exists in both eamap and Users, and that we are logged in # Assert our user exists in both eamap and Users, and that we are logged in
try: try:
...@@ -244,7 +248,9 @@ class SSLClientTest(ModuleStoreTestCase): ...@@ -244,7 +248,9 @@ class SSLClientTest(ModuleStoreTestCase):
and this should not fail. and this should not fail.
""" """
# Create account, break internal password, and activate account # Create account, break internal password, and activate account
external_auth.views.ssl_login(self._create_ssl_request('/'))
with self._create_ssl_request('/') as request:
external_auth.views.ssl_login(request)
user = User.objects.get(email=self.USER_EMAIL) user = User.objects.get(email=self.USER_EMAIL)
user.set_password('not autogenerated') user.set_password('not autogenerated')
user.is_active = True user.is_active = True
...@@ -262,12 +268,13 @@ class SSLClientTest(ModuleStoreTestCase): ...@@ -262,12 +268,13 @@ class SSLClientTest(ModuleStoreTestCase):
"""Make sure no external auth happens without SSL enabled""" """Make sure no external auth happens without SSL enabled"""
dec_mock = external_auth.views.ssl_login_shortcut(self.mock) dec_mock = external_auth.views.ssl_login_shortcut(self.mock)
request = self._create_normal_request(self.MOCK_URL)
request.user = AnonymousUser() with self._create_normal_request(self.MOCK_URL) as request:
# Call decorated mock function to make sure it passes request.user = AnonymousUser()
# the call through without hitting the external_auth functions and # Call decorated mock function to make sure it passes
# thereby creating an external auth map object. # the call through without hitting the external_auth functions and
dec_mock(request) # thereby creating an external auth map object.
dec_mock(request)
self.assertTrue(self.mock.called) self.assertTrue(self.mock.called)
self.assertEqual(0, len(ExternalAuthMap.objects.all())) self.assertEqual(0, len(ExternalAuthMap.objects.all()))
...@@ -278,23 +285,23 @@ class SSLClientTest(ModuleStoreTestCase): ...@@ -278,23 +285,23 @@ class SSLClientTest(ModuleStoreTestCase):
dec_mock = external_auth.views.ssl_login_shortcut(self.mock) dec_mock = external_auth.views.ssl_login_shortcut(self.mock)
# Test that anonymous without cert doesn't create authmap # Test that anonymous without cert doesn't create authmap
request = self._create_normal_request(self.MOCK_URL) with self._create_normal_request(self.MOCK_URL) as request:
dec_mock(request) dec_mock(request)
self.assertTrue(self.mock.called) self.assertTrue(self.mock.called)
self.assertEqual(0, len(ExternalAuthMap.objects.all())) self.assertEqual(0, len(ExternalAuthMap.objects.all()))
# Test valid user # Test valid user
self.mock.reset_mock() self.mock.reset_mock()
request = self._create_ssl_request(self.MOCK_URL) with self._create_ssl_request(self.MOCK_URL) as request:
dec_mock(request) dec_mock(request)
self.assertFalse(self.mock.called) self.assertFalse(self.mock.called)
self.assertEqual(1, len(ExternalAuthMap.objects.all())) self.assertEqual(1, len(ExternalAuthMap.objects.all()))
# Test logged in user gets called # Test logged in user gets called
self.mock.reset_mock() self.mock.reset_mock()
request = self._create_ssl_request(self.MOCK_URL) with self._create_ssl_request(self.MOCK_URL) as request:
request.user = UserFactory() request.user = UserFactory()
dec_mock(request) dec_mock(request)
self.assertTrue(self.mock.called) self.assertTrue(self.mock.called)
@unittest.skipUnless(settings.ROOT_URLCONF == 'lms.urls', 'Test only valid in lms') @unittest.skipUnless(settings.ROOT_URLCONF == 'lms.urls', 'Test only valid in lms')
...@@ -306,8 +313,9 @@ class SSLClientTest(ModuleStoreTestCase): ...@@ -306,8 +313,9 @@ class SSLClientTest(ModuleStoreTestCase):
""" """
dec_mock = external_auth.views.ssl_login_shortcut(self.mock) dec_mock = external_auth.views.ssl_login_shortcut(self.mock)
request = self._create_ssl_request(self.MOCK_URL) with self._create_ssl_request(self.MOCK_URL) as request:
dec_mock(request) dec_mock(request)
# Assert our user exists in both eamap and Users # Assert our user exists in both eamap and Users
try: try:
ExternalAuthMap.objects.get(external_id=self.USER_EMAIL) ExternalAuthMap.objects.get(external_id=self.USER_EMAIL)
...@@ -334,7 +342,8 @@ class SSLClientTest(ModuleStoreTestCase): ...@@ -334,7 +342,8 @@ class SSLClientTest(ModuleStoreTestCase):
display_name='Robot Super Course' display_name='Robot Super Course'
) )
external_auth.views.ssl_login(self._create_ssl_request('/')) with self._create_ssl_request('/') as request:
external_auth.views.ssl_login(request)
user = User.objects.get(email=self.USER_EMAIL) user = User.objects.get(email=self.USER_EMAIL)
CourseEnrollment.enroll(user, course.id) CourseEnrollment.enroll(user, course.id)
course_private_url = '/courses/MITx/999/Robot_Super_Course/courseware' course_private_url = '/courses/MITx/999/Robot_Super_Course/courseware'
...@@ -364,7 +373,8 @@ class SSLClientTest(ModuleStoreTestCase): ...@@ -364,7 +373,8 @@ class SSLClientTest(ModuleStoreTestCase):
display_name='Robot Super Course' display_name='Robot Super Course'
) )
external_auth.views.ssl_login(self._create_ssl_request('/')) with self._create_ssl_request('/') as request:
external_auth.views.ssl_login(request)
user = User.objects.get(email=self.USER_EMAIL) user = User.objects.get(email=self.USER_EMAIL)
CourseEnrollment.enroll(user, course.id) CourseEnrollment.enroll(user, course.id)
......
common/djangoapps/request_cache/__init__.py
...@@ -9,6 +9,7 @@ import logging ...@@ -9,6 +9,7 @@ import logging
from urlparse import urlparse from urlparse import urlparse
from celery.signals import task_postrun from celery.signals import task_postrun
import crum
from django.conf import settings from django.conf import settings
from django.test.client import RequestFactory from django.test.client import RequestFactory
...@@ -42,8 +43,10 @@ def get_cache(name): ...@@ -42,8 +43,10 @@ def get_cache(name):
def get_request(): def get_request():
""" """
Return the current request. Return the current request.
Deprecated: Please use crum to retrieve current requests.
""" """
return middleware.RequestCache.get_current_request() return crum.get_current_request()
def get_request_or_stub(): def get_request_or_stub():
...@@ -56,7 +59,7 @@ def get_request_or_stub(): ...@@ -56,7 +59,7 @@ def get_request_or_stub():
This is useful in cases where we need to pass in a request object This is useful in cases where we need to pass in a request object
but don't have an active request (for example, in test cases). but don't have an active request (for example, in test cases).
""" """
request = get_request() request = crum.get_current_request()
if request is None: if request is None:
log.warning( log.warning(
......
common/djangoapps/request_cache/middleware.py
"""
An implementation of a RequestCache. This cache is reset at the beginning
and end of every request.
"""
import crum
import threading import threading
...@@ -8,7 +14,6 @@ class _RequestCache(threading.local): ...@@ -8,7 +14,6 @@ class _RequestCache(threading.local):
def __init__(self): def __init__(self):
super(_RequestCache, self).__init__() super(_RequestCache, self).__init__()
self.data = {} self.data = {}
self.request = None
REQUEST_CACHE = _RequestCache() REQUEST_CACHE = _RequestCache()
...@@ -30,7 +35,7 @@ class RequestCache(object): ...@@ -30,7 +35,7 @@ class RequestCache(object):
""" """
This method is deprecated. Please use :func:`request_cache.get_request`. This method is deprecated. Please use :func:`request_cache.get_request`.
""" """
return REQUEST_CACHE.request return crum.get_current_request()
@classmethod @classmethod
def clear_request_cache(cls): def clear_request_cache(cls):
...@@ -38,13 +43,18 @@ class RequestCache(object): ...@@ -38,13 +43,18 @@ class RequestCache(object):
Empty the request cache. Empty the request cache.
""" """
REQUEST_CACHE.data = {} REQUEST_CACHE.data = {}
REQUEST_CACHE.request = None
def process_request(self, request): def process_request(self, request):
self.clear_request_cache() self.clear_request_cache()
REQUEST_CACHE.request = request
return None return None
def process_response(self, request, response): def process_response(self, request, response):
self.clear_request_cache() self.clear_request_cache()
return response return response
def process_exception(self, request, exception): # pylint: disable=unused-argument
"""
Clear the RequestCache after a failed request.
"""
self.clear_request_cache()
return None
common/djangoapps/student/tests/test_create_account.py
...@@ -16,7 +16,6 @@ import mock ...@@ -16,7 +16,6 @@ import mock
from openedx.core.djangoapps.user_api.preferences.api import get_user_preference from openedx.core.djangoapps.user_api.preferences.api import get_user_preference
from lang_pref import LANGUAGE_KEY from lang_pref import LANGUAGE_KEY
from notification_prefs import NOTIFICATION_PREF_KEY from notification_prefs import NOTIFICATION_PREF_KEY
from edxmako.tests import mako_middleware_process_request
from external_auth.models import ExternalAuthMap from external_auth.models import ExternalAuthMap
import student import student
from student.models import UserAttribute from student.models import UserAttribute
...@@ -231,9 +230,9 @@ class TestCreateAccount(TestCase): ...@@ -231,9 +230,9 @@ class TestCreateAccount(TestCase):
request.session['ExternalAuthMap'] = extauth request.session['ExternalAuthMap'] = extauth
request.user = AnonymousUser() request.user = AnonymousUser()
mako_middleware_process_request(request) with mock.patch('edxmako.request_context.get_current_request', return_value=request):
with mock.patch('django.contrib.auth.models.User.email_user') as mock_send_mail: with mock.patch('django.contrib.auth.models.User.email_user') as mock_send_mail:
student.views.create_account(request) student.views.create_account(request)
# check that send_mail is called # check that send_mail is called
if bypass_activation_email: if bypass_activation_email:
......
common/djangoapps/student/tests/test_email.py
...@@ -18,7 +18,6 @@ from mock import Mock, patch ...@@ -18,7 +18,6 @@ from mock import Mock, patch
from django.http import HttpResponse from django.http import HttpResponse
from django.conf import settings from django.conf import settings
from edxmako.shortcuts import render_to_string from edxmako.shortcuts import render_to_string
from edxmako.tests import mako_middleware_process_request
from util.request import safe_get_host from util.request import safe_get_host
from util.testing import EventTestMixin from util.testing import EventTestMixin
from openedx.core.djangoapps.theming.test_util import with_is_edx_domain from openedx.core.djangoapps.theming.test_util import with_is_edx_domain
...@@ -173,9 +172,9 @@ class ReactivationEmailTests(EmailTestMixin, TestCase): ...@@ -173,9 +172,9 @@ class ReactivationEmailTests(EmailTestMixin, TestCase):
request.META['HTTP_HOST'] = "aGenericValidHostName" request.META['HTTP_HOST'] = "aGenericValidHostName"
self.append_allowed_hosts("aGenericValidHostName") self.append_allowed_hosts("aGenericValidHostName")
mako_middleware_process_request(request) with patch('edxmako.request_context.get_current_request', return_value=request):
body = render_to_string('emails/activation_email.txt', context) body = render_to_string('emails/activation_email.txt', context)
host = safe_get_host(request) host = safe_get_host(request)
self.assertIn(host, body) self.assertIn(host, body)
...@@ -368,9 +367,9 @@ class EmailChangeConfirmationTests(EmailTestMixin, TransactionTestCase): ...@@ -368,9 +367,9 @@ class EmailChangeConfirmationTests(EmailTestMixin, TransactionTestCase):
request.META['HTTP_HOST'] = "aGenericValidHostName" request.META['HTTP_HOST'] = "aGenericValidHostName"
self.append_allowed_hosts("aGenericValidHostName") self.append_allowed_hosts("aGenericValidHostName")
mako_middleware_process_request(request) with patch('edxmako.request_context.get_current_request', return_value=request):
body = render_to_string('emails/confirm_email_change.txt', context) body = render_to_string('emails/confirm_email_change.txt', context)
url = safe_get_host(request) url = safe_get_host(request)
self.assertIn(url, body) self.assertIn(url, body)
......
common/djangoapps/student/tests/test_password_policy.py
...@@ -11,7 +11,6 @@ from importlib import import_module ...@@ -11,7 +11,6 @@ from importlib import import_module
from django.test.utils import override_settings from django.test.utils import override_settings
from django.conf import settings from django.conf import settings
from mock import patch from mock import patch
from edxmako.tests import mako_middleware_process_request
from external_auth.models import ExternalAuthMap from external_auth.models import ExternalAuthMap
from student.views import create_account from student.views import create_account
...@@ -262,8 +261,8 @@ class TestPasswordPolicy(TestCase): ...@@ -262,8 +261,8 @@ class TestPasswordPolicy(TestCase):
request.session['ExternalAuthMap'] = extauth request.session['ExternalAuthMap'] = extauth
request.user = AnonymousUser() request.user = AnonymousUser()
mako_middleware_process_request(request) with patch('edxmako.request_context.get_current_request', return_value=request):
response = create_account(request) response = create_account(request)
self.assertEqual(response.status_code, 200) self.assertEqual(response.status_code, 200)
obj = json.loads(response.content) obj = json.loads(response.content)
self.assertTrue(obj['success']) self.assertTrue(obj['success'])
......
common/djangoapps/third_party_auth/tests/specs/base.py
...@@ -5,6 +5,7 @@ import unittest ...@@ -5,6 +5,7 @@ import unittest
import json import json
import mock import mock
from contextlib import contextmanager
from django import test from django import test
from django.contrib import auth from django.contrib import auth
from django.contrib.auth import models as auth_models from django.contrib.auth import models as auth_models
...@@ -17,7 +18,6 @@ from social import actions, exceptions ...@@ -17,7 +18,6 @@ from social import actions, exceptions
from social.apps.django_app import utils as social_utils from social.apps.django_app import utils as social_utils
from social.apps.django_app import views as social_views from social.apps.django_app import views as social_views
from edxmako.tests import mako_middleware_process_request
from lms.djangoapps.commerce.tests import TEST_API_URL, TEST_API_SIGNING_KEY from lms.djangoapps.commerce.tests import TEST_API_URL, TEST_API_SIGNING_KEY
from student import models as student_models from student import models as student_models
from student import views as student_views from student import views as student_views
...@@ -526,6 +526,13 @@ class IntegrationTest(testutil.TestCase, test.TestCase): ...@@ -526,6 +526,13 @@ class IntegrationTest(testutil.TestCase, test.TestCase):
return request, strategy return request, strategy
@contextmanager
def _patch_edxmako_current_request(self, request):
"""Make ``request`` be the current request for edxmako template rendering."""
with mock.patch('edxmako.request_context.get_current_request', return_value=request):
yield
def get_user_by_email(self, strategy, email): def get_user_by_email(self, strategy, email):
"""Gets a user by email, using the given strategy.""" """Gets a user by email, using the given strategy."""
return strategy.storage.user.user_model().objects.get(email=email) return strategy.storage.user.user_model().objects.get(email=email)
...@@ -579,7 +586,6 @@ class IntegrationTest(testutil.TestCase, test.TestCase): ...@@ -579,7 +586,6 @@ class IntegrationTest(testutil.TestCase, test.TestCase):
pipeline.get_login_url(self.provider.provider_id, pipeline.AUTH_ENTRY_LOGIN)) pipeline.get_login_url(self.provider.provider_id, pipeline.AUTH_ENTRY_LOGIN))
actions.do_complete(request.backend, social_views._do_login) # pylint: disable=protected-access actions.do_complete(request.backend, social_views._do_login) # pylint: disable=protected-access
mako_middleware_process_request(strategy.request)
student_views.signin_user(strategy.request) student_views.signin_user(strategy.request)
student_views.login_user(strategy.request) student_views.login_user(strategy.request)
actions.do_complete(request.backend, social_views._do_login) # pylint: disable=protected-access actions.do_complete(request.backend, social_views._do_login) # pylint: disable=protected-access
...@@ -627,10 +633,10 @@ class IntegrationTest(testutil.TestCase, test.TestCase): ...@@ -627,10 +633,10 @@ class IntegrationTest(testutil.TestCase, test.TestCase):
pipeline.get_login_url(self.provider.provider_id, pipeline.AUTH_ENTRY_LOGIN)) pipeline.get_login_url(self.provider.provider_id, pipeline.AUTH_ENTRY_LOGIN))
actions.do_complete(request.backend, social_views._do_login) # pylint: disable=protected-access actions.do_complete(request.backend, social_views._do_login) # pylint: disable=protected-access
mako_middleware_process_request(strategy.request) with self._patch_edxmako_current_request(strategy.request):
student_views.signin_user(strategy.request) student_views.signin_user(strategy.request)
student_views.login_user(strategy.request) student_views.login_user(strategy.request)
actions.do_complete(request.backend, social_views._do_login, user=user) # pylint: disable=protected-access actions.do_complete(request.backend, social_views._do_login, user=user) # pylint: disable=protected-access
# First we expect that we're in the linked state, with a backend entry. # First we expect that we're in the linked state, with a backend entry.
self.assert_account_settings_context_looks_correct(account_settings_context(request), user, linked=True) self.assert_account_settings_context_looks_correct(account_settings_context(request), user, linked=True)
...@@ -686,10 +692,10 @@ class IntegrationTest(testutil.TestCase, test.TestCase): ...@@ -686,10 +692,10 @@ class IntegrationTest(testutil.TestCase, test.TestCase):
self.client.get(pipeline.get_login_url(self.provider.provider_id, pipeline.AUTH_ENTRY_LOGIN)) self.client.get(pipeline.get_login_url(self.provider.provider_id, pipeline.AUTH_ENTRY_LOGIN))
actions.do_complete(request.backend, social_views._do_login) # pylint: disable=protected-access actions.do_complete(request.backend, social_views._do_login) # pylint: disable=protected-access
mako_middleware_process_request(strategy.request) with self._patch_edxmako_current_request(strategy.request):
student_views.signin_user(strategy.request) student_views.signin_user(strategy.request)
student_views.login_user(strategy.request) student_views.login_user(strategy.request)
actions.do_complete(request.backend, social_views._do_login, user=user) # pylint: disable=protected-access actions.do_complete(request.backend, social_views._do_login, user=user) # pylint: disable=protected-access
# Monkey-patch storage for messaging; pylint: disable=protected-access # Monkey-patch storage for messaging; pylint: disable=protected-access
request._messages = fallback.FallbackStorage(request) request._messages = fallback.FallbackStorage(request)
...@@ -727,10 +733,10 @@ class IntegrationTest(testutil.TestCase, test.TestCase): ...@@ -727,10 +733,10 @@ class IntegrationTest(testutil.TestCase, test.TestCase):
# pylint: disable=protected-access # pylint: disable=protected-access
self.assert_redirect_to_login_looks_correct(actions.do_complete(request.backend, social_views._do_login)) self.assert_redirect_to_login_looks_correct(actions.do_complete(request.backend, social_views._do_login))
mako_middleware_process_request(strategy.request)
# At this point we know the pipeline has resumed correctly. Next we # At this point we know the pipeline has resumed correctly. Next we
# fire off the view that displays the login form and posts it via JS. # fire off the view that displays the login form and posts it via JS.
self.assert_login_response_in_pipeline_looks_correct(student_views.signin_user(strategy.request)) with self._patch_edxmako_current_request(strategy.request):
self.assert_login_response_in_pipeline_looks_correct(student_views.signin_user(strategy.request))
# Next, we invoke the view that handles the POST, and expect it # Next, we invoke the view that handles the POST, and expect it
# redirects to /auth/complete. In the browser ajax handlers will # redirects to /auth/complete. In the browser ajax handlers will
...@@ -760,8 +766,8 @@ class IntegrationTest(testutil.TestCase, test.TestCase): ...@@ -760,8 +766,8 @@ class IntegrationTest(testutil.TestCase, test.TestCase):
user.is_active = False user.is_active = False
user.save() user.save()
mako_middleware_process_request(strategy.request) with self._patch_edxmako_current_request(strategy.request):
self.assert_json_failure_response_is_inactive_account(student_views.login_user(strategy.request)) self.assert_json_failure_response_is_inactive_account(student_views.login_user(strategy.request))
def test_signin_fails_if_no_account_associated(self): def test_signin_fails_if_no_account_associated(self):
_, strategy = self.get_request_and_strategy( _, strategy = self.get_request_and_strategy(
...@@ -806,11 +812,11 @@ class IntegrationTest(testutil.TestCase, test.TestCase): ...@@ -806,11 +812,11 @@ class IntegrationTest(testutil.TestCase, test.TestCase):
# pylint: disable=protected-access # pylint: disable=protected-access
self.assert_redirect_to_register_looks_correct(actions.do_complete(request.backend, social_views._do_login)) self.assert_redirect_to_register_looks_correct(actions.do_complete(request.backend, social_views._do_login))
mako_middleware_process_request(strategy.request)
# At this point we know the pipeline has resumed correctly. Next we # At this point we know the pipeline has resumed correctly. Next we
# fire off the view that displays the registration form. # fire off the view that displays the registration form.
self.assert_register_response_in_pipeline_looks_correct( with self._patch_edxmako_current_request(request):
student_views.register_user(strategy.request), pipeline.get(request)['kwargs']) self.assert_register_response_in_pipeline_looks_correct(
student_views.register_user(strategy.request), pipeline.get(request)['kwargs'])
# Next, we invoke the view that handles the POST. Not all providers # Next, we invoke the view that handles the POST. Not all providers
# supply email. Manually add it as the user would have to; this # supply email. Manually add it as the user would have to; this
...@@ -828,7 +834,8 @@ class IntegrationTest(testutil.TestCase, test.TestCase): ...@@ -828,7 +834,8 @@ class IntegrationTest(testutil.TestCase, test.TestCase):
# ...but when we invoke create_account the existing edX view will make # ...but when we invoke create_account the existing edX view will make
# it, but not social auths. The pipeline creates those later. # it, but not social auths. The pipeline creates those later.
self.assert_json_success_response_looks_correct(student_views.create_account(strategy.request)) with self._patch_edxmako_current_request(strategy.request):
self.assert_json_success_response_looks_correct(student_views.create_account(strategy.request))
# We've overridden the user's password, so authenticate() with the old # We've overridden the user's password, so authenticate() with the old
# value won't work: # value won't work:
created_user = self.get_user_by_email(strategy, email) created_user = self.get_user_by_email(strategy, email)
...@@ -876,12 +883,14 @@ class IntegrationTest(testutil.TestCase, test.TestCase): ...@@ -876,12 +883,14 @@ class IntegrationTest(testutil.TestCase, test.TestCase):
# pylint: disable=protected-access # pylint: disable=protected-access
self.assert_redirect_to_register_looks_correct(actions.do_complete(backend, social_views._do_login)) self.assert_redirect_to_register_looks_correct(actions.do_complete(backend, social_views._do_login))
mako_middleware_process_request(strategy.request) with self._patch_edxmako_current_request(request):
self.assert_register_response_in_pipeline_looks_correct( self.assert_register_response_in_pipeline_looks_correct(
student_views.register_user(strategy.request), pipeline.get(request)['kwargs']) student_views.register_user(strategy.request), pipeline.get(request)['kwargs'])
strategy.request.POST = self.get_registration_post_vars()
# Create twice: once successfully, and once causing a collision. with self._patch_edxmako_current_request(strategy.request):
student_views.create_account(strategy.request) strategy.request.POST = self.get_registration_post_vars()
# Create twice: once successfully, and once causing a collision.
student_views.create_account(strategy.request)
self.assert_json_failure_response_is_username_collision(student_views.create_account(strategy.request)) self.assert_json_failure_response_is_username_collision(student_views.create_account(strategy.request))
def test_pipeline_raises_auth_entry_error_if_auth_entry_invalid(self): def test_pipeline_raises_auth_entry_error_if_auth_entry_invalid(self):
......
lms/djangoapps/branding/tests/test_page.py
...@@ -16,7 +16,6 @@ from nose.plugins.attrib import attr ...@@ -16,7 +16,6 @@ from nose.plugins.attrib import attr
from edxmako.shortcuts import render_to_response from edxmako.shortcuts import render_to_response
from branding.views import index from branding.views import index
from edxmako.tests import mako_middleware_process_request
import student.views import student.views
from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
from xmodule.modulestore.tests.factories import CourseFactory from xmodule.modulestore.tests.factories import CourseFactory
...@@ -63,11 +62,9 @@ class AnonymousIndexPageTest(ModuleStoreTestCase): ...@@ -63,11 +62,9 @@ class AnonymousIndexPageTest(ModuleStoreTestCase):
anonymous and start dates are being checked. It replaces a previous anonymous and start dates are being checked. It replaces a previous
test as it solves the issue in a different way test as it solves the issue in a different way
""" """
request = self.factory.get('/') self.client.logout()
request.user = AnonymousUser() response = self.client.get(reverse('root'))
self.assertEqual(response.status_code, 200)
mako_middleware_process_request(request)
student.views.index(request)
@override_settings(FEATURES=FEATURES_WITH_STARTDATE) @override_settings(FEATURES=FEATURES_WITH_STARTDATE)
def test_anon_user_with_startdate_index(self): def test_anon_user_with_startdate_index(self):
......
lms/djangoapps/ccx/tests/test_field_override_performance.py
...@@ -14,7 +14,6 @@ from django.conf import settings ...@@ -14,7 +14,6 @@ from django.conf import settings
from django.core.cache import caches from django.core.cache import caches
from django.test.client import RequestFactory from django.test.client import RequestFactory
from django.test.utils import override_settings from django.test.utils import override_settings
from edxmako.middleware import MakoMiddleware
from nose.plugins.attrib import attr from nose.plugins.attrib import attr
from pytz import UTC from pytz import UTC
from request_cache.middleware import RequestCache from request_cache.middleware import RequestCache
...@@ -64,11 +63,13 @@ class FieldOverridePerformanceTestCase(ProceduralCourseTestMixin, ...@@ -64,11 +63,13 @@ class FieldOverridePerformanceTestCase(ProceduralCourseTestMixin,
self.student = UserFactory.create() self.student = UserFactory.create()
self.request = self.request_factory.get("foo") self.request = self.request_factory.get("foo")
self.request.user = self.student self.request.user = self.student
patcher = mock.patch('edxmako.request_context.get_current_request', return_value=self.request)
patcher.start()
self.addCleanup(patcher.stop)
self.course = None self.course = None
self.ccx = None self.ccx = None
MakoMiddleware().process_request(self.request)
def setup_course(self, size, enable_ccx, view_as_ccx): def setup_course(self, size, enable_ccx, view_as_ccx):
""" """
Build a gradable course where each node has `size` children. Build a gradable course where each node has `size` children.
......
lms/djangoapps/courseware/tests/test_access.py
...@@ -30,7 +30,6 @@ from courseware.tests.factories import ( ...@@ -30,7 +30,6 @@ from courseware.tests.factories import (
) )
import courseware.views.views as views import courseware.views.views as views
from courseware.tests.helpers import LoginEnrollmentTestCase from courseware.tests.helpers import LoginEnrollmentTestCase
from edxmako.tests import mako_middleware_process_request
from openedx.core.djangoapps.content.course_overviews.models import CourseOverview from openedx.core.djangoapps.content.course_overviews.models import CourseOverview
from student.models import CourseEnrollment from student.models import CourseEnrollment
from student.roles import CourseCcxCoachRole from student.roles import CourseCcxCoachRole
...@@ -137,21 +136,13 @@ class CoachAccessTestCaseCCX(SharedModuleStoreTestCase, LoginEnrollmentTestCase) ...@@ -137,21 +136,13 @@ class CoachAccessTestCaseCCX(SharedModuleStoreTestCase, LoginEnrollmentTestCase)
CourseEnrollment.enroll(student, ccx_locator) CourseEnrollment.enroll(student, ccx_locator)
# Test for access of a coach # Test for access of a coach
request = self.request_factory.get(reverse('about_course', args=[unicode(ccx_locator)])) resp = self.client.get(reverse('student_progress', args=[unicode(ccx_locator), student.id]))
request.user = self.coach
mako_middleware_process_request(request)
resp = views.progress(request, course_id=unicode(ccx_locator), student_id=student.id)
self.assertEqual(resp.status_code, 200) self.assertEqual(resp.status_code, 200)
# Assert access of a student # Assert access of a student
request = self.request_factory.get(reverse('about_course', args=[unicode(ccx_locator)])) self.client.login(username=student.username, password='test')
request.user = student resp = self.client.get(reverse('student_progress', args=[unicode(ccx_locator), self.coach.id]))
mako_middleware_process_request(request) self.assertEqual(resp.status_code, 404)
with self.assertRaises(Http404) as context:
views.progress(request, course_id=unicode(ccx_locator), student_id=self.coach.id)
self.assertIsNotNone(context.exception)
@attr('shard_1') @attr('shard_1')
......
lms/djangoapps/courseware/views/views.py
...@@ -658,7 +658,6 @@ def course_about(request, course_id): ...@@ -658,7 +658,6 @@ def course_about(request, course_id):
@ensure_valid_course_key @ensure_valid_course_key
def progress(request, course_id, student_id=None): def progress(request, course_id, student_id=None):
""" Display the progress page. """ """ Display the progress page. """
course_key = CourseKey.from_string(course_id) course_key = CourseKey.from_string(course_id)
with modulestore().bulk_operations(course_key): with modulestore().bulk_operations(course_key):
...@@ -673,6 +672,14 @@ def _progress(request, course_key, student_id): ...@@ -673,6 +672,14 @@ def _progress(request, course_key, student_id):
Course staff are allowed to see the progress of students in their class. Course staff are allowed to see the progress of students in their class.
""" """
if student_id is not None:
try:
student_id = int(student_id)
# Check for ValueError if 'student_id' cannot be converted to integer.
except ValueError:
raise Http404
course = get_course_with_access(request.user, 'load', course_key, depth=None, check_if_enrolled=True) course = get_course_with_access(request.user, 'load', course_key, depth=None, check_if_enrolled=True)
# check to see if there is a required survey that must be taken before # check to see if there is a required survey that must be taken before
...@@ -697,8 +704,7 @@ def _progress(request, course_key, student_id): ...@@ -697,8 +704,7 @@ def _progress(request, course_key, student_id):
raise Http404 raise Http404
try: try:
student = User.objects.get(id=student_id) student = User.objects.get(id=student_id)
# Check for ValueError if 'student_id' cannot be converted to integer. except User.DoesNotExist:
except (ValueError, User.DoesNotExist):
raise Http404 raise Http404
# NOTE: To make sure impersonation by instructor works, use # NOTE: To make sure impersonation by instructor works, use
......
lms/djangoapps/django_comment_client/forum/tests.py
...@@ -8,7 +8,6 @@ from django.test.client import Client, RequestFactory ...@@ -8,7 +8,6 @@ from django.test.client import Client, RequestFactory
from django.test.utils import override_settings from django.test.utils import override_settings
from django.utils import translation from django.utils import translation
from lms.lib.comment_client.utils import CommentClientPaginatedResult from lms.lib.comment_client.utils import CommentClientPaginatedResult
from edxmako.tests import mako_middleware_process_request
from django_comment_common.utils import ThreadContext from django_comment_common.utils import ThreadContext
from django_comment_client.forum import views from django_comment_client.forum import views
...@@ -441,14 +440,13 @@ class SingleCohortedThreadTestCase(CohortedTestCase): ...@@ -441,14 +440,13 @@ class SingleCohortedThreadTestCase(CohortedTestCase):
def test_html(self, mock_request): def test_html(self, mock_request):
self._create_mock_cohorted_thread(mock_request) self._create_mock_cohorted_thread(mock_request)
request = RequestFactory().get("dummy_url") self.client.login(username=self.student.username, password='test')
request.user = self.student response = self.client.get(
mako_middleware_process_request(request) reverse('single_thread', kwargs={
response = views.single_thread( 'course_id': unicode(self.course.id),
request, 'discussion_id': "cohorted_topic",
self.course.id.to_deprecated_string(), 'thread_id': self.mock_thread_id,
"cohorted_topic", })
self.mock_thread_id
) )
self.assertEquals(response.status_code, 200) self.assertEquals(response.status_code, 200)
...@@ -561,19 +559,14 @@ class SingleThreadGroupIdTestCase(CohortedTestCase, CohortedTopicGroupIdTestMixi ...@@ -561,19 +559,14 @@ class SingleThreadGroupIdTestCase(CohortedTestCase, CohortedTopicGroupIdTestMixi
headers = {} headers = {}
if is_ajax: if is_ajax:
headers['HTTP_X_REQUESTED_WITH'] = "XMLHttpRequest" headers['HTTP_X_REQUESTED_WITH'] = "XMLHttpRequest"
request = RequestFactory().get(
"dummy_url", self.client.login(username=user.username, password='test')
return self.client.get(
reverse('single_thread', args=[unicode(self.course.id), commentable_id, "dummy_thread_id"]),
data=request_data, data=request_data,
**headers **headers
) )
request.user = user
mako_middleware_process_request(request)
return views.single_thread(
request,
self.course.id.to_deprecated_string(),
commentable_id,
"dummy_thread_id"
)
def test_group_info_in_html_response(self, mock_request): def test_group_info_in_html_response(self, mock_request):
response = self.call_view( response = self.call_view(
...@@ -599,30 +592,28 @@ class SingleThreadGroupIdTestCase(CohortedTestCase, CohortedTopicGroupIdTestMixi ...@@ -599,30 +592,28 @@ class SingleThreadGroupIdTestCase(CohortedTestCase, CohortedTopicGroupIdTestMixi
@patch('requests.request', autospec=True) @patch('requests.request', autospec=True)
class SingleThreadContentGroupTestCase(ContentGroupTestCase): class SingleThreadContentGroupTestCase(UrlResetMixin, ContentGroupTestCase):
@patch.dict("django.conf.settings.FEATURES", {"ENABLE_DISCUSSION_SERVICE": True})
def setUp(self):
super(SingleThreadContentGroupTestCase, self).setUp()
def assert_can_access(self, user, discussion_id, thread_id, should_have_access): def assert_can_access(self, user, discussion_id, thread_id, should_have_access):
""" """
Verify that a user has access to a thread within a given Verify that a user has access to a thread within a given
discussion_id when should_have_access is True, otherwise discussion_id when should_have_access is True, otherwise
verify that the user does not have access to that thread. verify that the user does not have access to that thread.
""" """
request = RequestFactory().get("dummy_url")
request.user = user
mako_middleware_process_request(request)
def call_single_thread(): def call_single_thread():
return views.single_thread( self.client.login(username=user.username, password='test')
request, return self.client.get(
unicode(self.course.id), reverse('single_thread', args=[unicode(self.course.id), discussion_id, thread_id])
discussion_id,
thread_id
) )
if should_have_access: if should_have_access:
self.assertEqual(call_single_thread().status_code, 200) self.assertEqual(call_single_thread().status_code, 200)
else: else:
with self.assertRaises(Http404): self.assertEqual(call_single_thread().status_code, 404)
call_single_thread()
def test_staff_user(self, mock_request): def test_staff_user(self, mock_request):
""" """
...@@ -813,17 +804,13 @@ class ForumFormDiscussionGroupIdTestCase(CohortedTestCase, CohortedTopicGroupIdT ...@@ -813,17 +804,13 @@ class ForumFormDiscussionGroupIdTestCase(CohortedTestCase, CohortedTopicGroupIdT
headers = {} headers = {}
if is_ajax: if is_ajax:
headers['HTTP_X_REQUESTED_WITH'] = "XMLHttpRequest" headers['HTTP_X_REQUESTED_WITH'] = "XMLHttpRequest"
request = RequestFactory().get(
"dummy_url", self.client.login(username=user.username, password='test')
return self.client.get(
reverse(views.forum_form_discussion, args=[unicode(self.course.id)]),
data=request_data, data=request_data,
**headers **headers
) )
request.user = user
mako_middleware_process_request(request)
return views.forum_form_discussion(
request,
self.course.id.to_deprecated_string()
)
def test_group_info_in_html_response(self, mock_request): def test_group_info_in_html_response(self, mock_request):
response = self.call_view( response = self.call_view(
...@@ -869,18 +856,13 @@ class UserProfileDiscussionGroupIdTestCase(CohortedTestCase, CohortedTopicGroupI ...@@ -869,18 +856,13 @@ class UserProfileDiscussionGroupIdTestCase(CohortedTestCase, CohortedTopicGroupI
headers = {} headers = {}
if is_ajax: if is_ajax:
headers['HTTP_X_REQUESTED_WITH'] = "XMLHttpRequest" headers['HTTP_X_REQUESTED_WITH'] = "XMLHttpRequest"
request = RequestFactory().get(
"dummy_url", self.client.login(username=requesting_user.username, password='test')
return self.client.get(
reverse('user_profile', args=[unicode(self.course.id), profiled_user.id]),
data=request_data, data=request_data,
**headers **headers
) )
request.user = requesting_user
mako_middleware_process_request(request)
return views.user_profile(
request,
self.course.id.to_deprecated_string(),
profiled_user.id
)
def call_view(self, mock_request, _commentable_id, user, group_id, pass_group_id=True, is_ajax=False): def call_view(self, mock_request, _commentable_id, user, group_id, pass_group_id=True, is_ajax=False):
return self.call_view_for_profiled_user( return self.call_view_for_profiled_user(
...@@ -1109,11 +1091,12 @@ class InlineDiscussionTestCase(ModuleStoreTestCase): ...@@ -1109,11 +1091,12 @@ class InlineDiscussionTestCase(ModuleStoreTestCase):
@patch('requests.request', autospec=True) @patch('requests.request', autospec=True)
class UserProfileTestCase(ModuleStoreTestCase): class UserProfileTestCase(UrlResetMixin, ModuleStoreTestCase):
TEST_THREAD_TEXT = 'userprofile-test-text' TEST_THREAD_TEXT = 'userprofile-test-text'
TEST_THREAD_ID = 'userprofile-test-thread-id' TEST_THREAD_ID = 'userprofile-test-thread-id'
@patch.dict("django.conf.settings.FEATURES", {"ENABLE_DISCUSSION_SERVICE": True})
def setUp(self): def setUp(self):
super(UserProfileTestCase, self).setUp() super(UserProfileTestCase, self).setUp()
...@@ -1126,14 +1109,15 @@ class UserProfileTestCase(ModuleStoreTestCase): ...@@ -1126,14 +1109,15 @@ class UserProfileTestCase(ModuleStoreTestCase):
mock_request.side_effect = make_mock_request_impl( mock_request.side_effect = make_mock_request_impl(
course=self.course, text=self.TEST_THREAD_TEXT, thread_id=self.TEST_THREAD_ID course=self.course, text=self.TEST_THREAD_TEXT, thread_id=self.TEST_THREAD_ID
) )
request = RequestFactory().get("dummy_url", data=params, **headers) self.client.login(username=self.student.username, password='test')
request.user = self.student
mako_middleware_process_request(request) response = self.client.get(
response = views.user_profile( reverse('user_profile', kwargs={
request, 'course_id': unicode(self.course.id),
self.course.id.to_deprecated_string(), 'user_id': self.profiled_user.id,
self.profiled_user.id }),
data=params,
**headers
) )
mock_request.assert_any_call( mock_request.assert_any_call(
"get", "get",
......
lms/djangoapps/django_comment_client/tests/utils.py
...@@ -7,11 +7,12 @@ from openedx.core.djangoapps.course_groups.tests.helpers import CohortFactory ...@@ -7,11 +7,12 @@ from openedx.core.djangoapps.course_groups.tests.helpers import CohortFactory
from django_comment_common.models import Role from django_comment_common.models import Role
from django_comment_common.utils import seed_permissions_roles from django_comment_common.utils import seed_permissions_roles
from student.tests.factories import CourseEnrollmentFactory, UserFactory from student.tests.factories import CourseEnrollmentFactory, UserFactory
from util.testing import UrlResetMixin
from xmodule.modulestore.tests.factories import CourseFactory from xmodule.modulestore.tests.factories import CourseFactory
from xmodule.modulestore.tests.django_utils import SharedModuleStoreTestCase from xmodule.modulestore.tests.django_utils import SharedModuleStoreTestCase
class CohortedTestCase(SharedModuleStoreTestCase): class CohortedTestCase(UrlResetMixin, SharedModuleStoreTestCase):
""" """
Sets up a course with a student, a moderator and their cohorts. Sets up a course with a student, a moderator and their cohorts.
""" """
......
lms/djangoapps/notification_prefs/tests.py
...@@ -2,6 +2,7 @@ import json ...@@ -2,6 +2,7 @@ import json
from django.contrib.auth.models import AnonymousUser from django.contrib.auth.models import AnonymousUser
from django.core.exceptions import PermissionDenied from django.core.exceptions import PermissionDenied
from django.core.urlresolvers import reverse
from django.http import Http404 from django.http import Http404
from django.test import TestCase from django.test import TestCase
from django.test.client import RequestFactory from django.test.client import RequestFactory
...@@ -11,7 +12,6 @@ from mock import Mock, patch ...@@ -11,7 +12,6 @@ from mock import Mock, patch
from notification_prefs import NOTIFICATION_PREF_KEY from notification_prefs import NOTIFICATION_PREF_KEY
from notification_prefs.views import ajax_enable, ajax_disable, ajax_status, set_subscription, UsernameCipher from notification_prefs.views import ajax_enable, ajax_disable, ajax_status, set_subscription, UsernameCipher
from student.tests.factories import UserFactory from student.tests.factories import UserFactory
from edxmako.tests import mako_middleware_process_request
from openedx.core.djangoapps.user_api.models import UserPreference from openedx.core.djangoapps.user_api.models import UserPreference
from util.testing import UrlResetMixin from util.testing import UrlResetMixin
...@@ -214,11 +214,9 @@ class NotificationPrefViewTest(UrlResetMixin, TestCase): ...@@ -214,11 +214,9 @@ class NotificationPrefViewTest(UrlResetMixin, TestCase):
self.create_prefs() self.create_prefs()
def test_user(user): def test_user(user):
request = self.request_factory.get("dummy") url = reverse('unsubscribe_forum_update', args=[self.tokens[user]])
request.user = AnonymousUser()
mako_middleware_process_request(request) response = self.client.get(url)
response = set_subscription(request, self.tokens[user], subscribe=False)
self.assertEqual(response.status_code, 200) self.assertEqual(response.status_code, 200)
self.assertNotPrefExists(user) self.assertNotPrefExists(user)
...@@ -227,12 +225,10 @@ class NotificationPrefViewTest(UrlResetMixin, TestCase): ...@@ -227,12 +225,10 @@ class NotificationPrefViewTest(UrlResetMixin, TestCase):
def test_unsubscribe_twice(self): def test_unsubscribe_twice(self):
self.create_prefs() self.create_prefs()
request = self.request_factory.get("dummy")
request.user = AnonymousUser()
mako_middleware_process_request(request) url = reverse('unsubscribe_forum_update', args=[self.tokens[self.user]])
set_subscription(request, self.tokens[self.user], False) self.client.get(url)
response = set_subscription(request, self.tokens[self.user], subscribe=False) response = self.client.get(url)
self.assertEqual(response.status_code, 200) self.assertEqual(response.status_code, 200)
self.assertNotPrefExists(self.user) self.assertNotPrefExists(self.user)
...@@ -240,11 +236,8 @@ class NotificationPrefViewTest(UrlResetMixin, TestCase): ...@@ -240,11 +236,8 @@ class NotificationPrefViewTest(UrlResetMixin, TestCase):
def test_user(user): def test_user(user):
# start without a pref key # start without a pref key
self.assertFalse(UserPreference.objects.filter(user=user, key=NOTIFICATION_PREF_KEY)) self.assertFalse(UserPreference.objects.filter(user=user, key=NOTIFICATION_PREF_KEY))
request = self.request_factory.get("dummy") url = reverse('resubscribe_forum_update', args=[self.tokens[user]])
request.user = AnonymousUser() response = self.client.get(url)
mako_middleware_process_request(request)
response = set_subscription(request, self.tokens[user], subscribe=True)
self.assertEqual(response.status_code, 200) self.assertEqual(response.status_code, 200)
self.assertPrefValid(user) self.assertPrefValid(user)
......
lms/djangoapps/static_template_view/views.py
...@@ -71,8 +71,8 @@ def render_press_release(request, slug): ...@@ -71,8 +71,8 @@ def render_press_release(request, slug):
def render_404(request): def render_404(request):
return HttpResponseNotFound(render_to_string('static_templates/404.html', {})) return HttpResponseNotFound(render_to_string('static_templates/404.html', {}, request=request))
def render_500(request): def render_500(request):
return HttpResponseServerError(render_to_string('static_templates/server-error.html', {})) return HttpResponseServerError(render_to_string('static_templates/server-error.html', {}, request=request))
lms/envs/common.py
...@@ -1087,7 +1087,10 @@ simplefilter('ignore') ...@@ -1087,7 +1087,10 @@ simplefilter('ignore')
################################# Middleware ################################### ################################# Middleware ###################################
MIDDLEWARE_CLASSES = ( MIDDLEWARE_CLASSES = (
'crum.CurrentRequestUserMiddleware',
'request_cache.middleware.RequestCache', 'request_cache.middleware.RequestCache',
'mobile_api.middleware.AppVersionUpgrade', 'mobile_api.middleware.AppVersionUpgrade',
'header_control.middleware.HeaderControlMiddleware', 'header_control.middleware.HeaderControlMiddleware',
'microsite_configuration.middleware.MicrositeMiddleware', 'microsite_configuration.middleware.MicrositeMiddleware',
...@@ -1111,7 +1114,6 @@ MIDDLEWARE_CLASSES = ( ...@@ -1111,7 +1114,6 @@ MIDDLEWARE_CLASSES = (
'student.middleware.UserStandingMiddleware', 'student.middleware.UserStandingMiddleware',
'contentserver.middleware.StaticContentServer', 'contentserver.middleware.StaticContentServer',
'crum.CurrentRequestUserMiddleware',
# Adds user tags to tracking events # Adds user tags to tracking events
# Must go before TrackMiddleware, to get the context set up # Must go before TrackMiddleware, to get the context set up
...@@ -1151,8 +1153,6 @@ MIDDLEWARE_CLASSES = ( ...@@ -1151,8 +1153,6 @@ MIDDLEWARE_CLASSES = (
# catches any uncaught RateLimitExceptions and returns a 403 instead of a 500 # catches any uncaught RateLimitExceptions and returns a 403 instead of a 500
'ratelimitbackend.middleware.RateLimitMiddleware', 'ratelimitbackend.middleware.RateLimitMiddleware',
# needs to run after locale middleware (or anything that modifies the request context)
'edxmako.middleware.MakoMiddleware',
# for expiring inactive sessions # for expiring inactive sessions
'session_inactivity_timeout.middleware.SessionInactivityTimeout', 'session_inactivity_timeout.middleware.SessionInactivityTimeout',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment