raise 404 when copyright template is missing
This commit is contained in:
@@ -0,0 +1 @@
|
||||
This is a copyright page for an Open edX microsite.
|
||||
@@ -142,6 +142,26 @@ class TestMicrosites(ModuleStoreTestCase, LoginEnrollmentTestCase):
|
||||
# assert that footer template has been properly overriden on homepage
|
||||
self.assertNotContains(resp, 'This is a Test Microsite footer')
|
||||
|
||||
@override_settings(SITE_NAME=settings.MICROSITE_TEST_HOSTNAME)
|
||||
def test_microsite_anonymous_copyright_content(self):
|
||||
"""
|
||||
Verify that the copyright, when accessed via a Microsite domain, returns
|
||||
the expected 200 response
|
||||
"""
|
||||
|
||||
resp = self.client.get('/copyright', HTTP_HOST=settings.MICROSITE_TEST_HOSTNAME)
|
||||
self.assertEqual(resp.status_code, 200)
|
||||
|
||||
self.assertContains(resp, 'This is a copyright page for an Open edX microsite.')
|
||||
|
||||
def test_not_microsite_anonymous_copyright_content(self):
|
||||
"""
|
||||
Verify that the copyright page does not exist if we are not in a microsite
|
||||
"""
|
||||
|
||||
resp = self.client.get('/copyright')
|
||||
self.assertEqual(resp.status_code, 404)
|
||||
|
||||
def test_no_redirect_on_homepage_when_no_enrollments(self):
|
||||
"""
|
||||
Verify that a user going to homepage will not redirect if he/she has no course enrollments
|
||||
|
||||
@@ -45,7 +45,10 @@ def render(request, template):
|
||||
# Guess content type from file extension
|
||||
content_type, __ = mimetypes.guess_type(template)
|
||||
|
||||
return render_to_response('static_templates/' + template, {}, content_type=content_type)
|
||||
try:
|
||||
return render_to_response('static_templates/' + template, {}, content_type=content_type)
|
||||
except TopLevelLookupException:
|
||||
raise Http404
|
||||
|
||||
|
||||
@ensure_csrf_cookie
|
||||
|
||||
@@ -1,9 +0,0 @@
|
||||
<%! from django.utils.translation import ugettext as _ %>
|
||||
<%inherit file="../main.html" />
|
||||
|
||||
<%block name="pagetitle">${_("Copyright")}</%block>
|
||||
|
||||
<section class="container about">
|
||||
<h1>${_("Copyright")}</h1>
|
||||
<p>${_("This page left intentionally blank. It is not used by edx.org but is left here for possible use by installations of Open edX.")}</p>
|
||||
</section>
|
||||
@@ -186,8 +186,6 @@ if not settings.FEATURES["USE_CUSTOM_THEME"]:
|
||||
{'template': 'press.html'}, name="press"),
|
||||
url(r'^media-kit$', 'static_template_view.views.render',
|
||||
{'template': 'media-kit.html'}, name="media-kit"),
|
||||
|
||||
# TODO: (bridger) The copyright has been removed until it is updated for edX
|
||||
url(r'^copyright$', 'static_template_view.views.render',
|
||||
{'template': 'copyright.html'}, name="copyright"),
|
||||
|
||||
|
||||
Reference in New Issue
Block a user