Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-platform
Commits
d9ccaa65
Commit
d9ccaa65
authored
Aug 13, 2014
by
Waheed Ahmed
Committed by
Adam Palay
Aug 14, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Check REQUEST_CONTEXT.context exists before accessing it.
LMS-11226
parent
ad37d93d
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
26 additions
and
3 deletions
+26
-3
common/djangoapps/edxmako/shortcuts.py
+1
-1
common/djangoapps/edxmako/template.py
+1
-1
common/djangoapps/edxmako/tests.py
+24
-1
No files found.
common/djangoapps/edxmako/shortcuts.py
View file @
d9ccaa65
...
...
@@ -92,7 +92,7 @@ def render_to_string(template_name, dictionary, context=None, namespace='main'):
context_instance
[
'marketing_link'
]
=
marketing_link
# In various testing contexts, there might not be a current request context.
if
edxmako
.
middleware
.
REQUEST_CONTEXT
.
context
is
not
None
:
if
getattr
(
edxmako
.
middleware
.
REQUEST_CONTEXT
,
"context"
,
None
)
:
for
d
in
edxmako
.
middleware
.
REQUEST_CONTEXT
.
context
:
context_dictionary
.
update
(
d
)
for
d
in
context_instance
:
...
...
common/djangoapps/edxmako/template.py
View file @
d9ccaa65
...
...
@@ -48,7 +48,7 @@ class Template(MakoTemplate):
context_dictionary
=
{}
# In various testing contexts, there might not be a current request context.
if
edxmako
.
middleware
.
REQUEST_CONTEXT
.
context
is
not
None
:
if
getattr
(
edxmako
.
middleware
.
REQUEST_CONTEXT
,
"context"
,
None
)
:
for
d
in
edxmako
.
middleware
.
REQUEST_CONTEXT
.
context
:
context_dictionary
.
update
(
d
)
for
d
in
context_instance
:
...
...
common/djangoapps/edxmako/tests.py
View file @
d9ccaa65
from
mock
import
patch
,
Mock
import
unittest
from
django.conf
import
settings
from
django.http
import
HttpResponse
from
django.test
import
TestCase
from
django.test.utils
import
override_settings
...
...
@@ -7,7 +10,7 @@ from django.test.client import RequestFactory
from
django.core.urlresolvers
import
reverse
import
edxmako.middleware
from
edxmako
import
add_lookup
,
LOOKUP
from
edxmako.shortcuts
import
marketing_link
from
edxmako.shortcuts
import
marketing_link
,
render_to_string
from
student.tests.factories
import
UserFactory
from
util.testing
import
UrlResetMixin
...
...
@@ -71,6 +74,26 @@ class MakoMiddlewareTest(TestCase):
# requestcontext should be None.
self
.
assertIsNone
(
edxmako
.
middleware
.
REQUEST_CONTEXT
.
context
)
@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
,
context_mock
):
"""
Test render_to_string() when makomiddleware has not initialized
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
))
@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
,
context_mock
):
"""
Test render_to_string() when makomiddleware has not initialized
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
))
def
mako_middleware_process_request
(
request
):
"""
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment