Commit 0ad9eb91 by Simon Chen

Merge pull request #11943 from edx/schen/FixPageTagsOnDashboardMakoTemplates

Fix to remove mulitple page tags on mako templates
parents f1c700a6 d15e192b
...@@ -9,6 +9,7 @@ from datetime import datetime, timedelta ...@@ -9,6 +9,7 @@ from datetime import datetime, timedelta
from urlparse import urljoin from urlparse import urljoin
import pytz import pytz
from markupsafe import escape
from mock import Mock, patch from mock import Mock, patch
from opaque_keys.edx.locations import SlashSeparatedCourseKey from opaque_keys.edx.locations import SlashSeparatedCourseKey
from pyquery import PyQuery as pq from pyquery import PyQuery as pq
...@@ -404,7 +405,7 @@ class DashboardTest(ModuleStoreTestCase): ...@@ -404,7 +405,7 @@ class DashboardTest(ModuleStoreTestCase):
self.assertNotIn('Add Certificate to LinkedIn', response.content) self.assertNotIn('Add Certificate to LinkedIn', response.content)
response_url = 'http://www.linkedin.com/profile/add?_ed=' response_url = 'http://www.linkedin.com/profile/add?_ed='
self.assertNotContains(response, response_url) self.assertNotContains(response, escape(response_url))
@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.dict('django.conf.settings.FEATURES', {'CERTIFICATES_HTML_VIEW': False}) @patch.dict('django.conf.settings.FEATURES', {'CERTIFICATES_HTML_VIEW': False})
...@@ -452,7 +453,7 @@ class DashboardTest(ModuleStoreTestCase): ...@@ -452,7 +453,7 @@ class DashboardTest(ModuleStoreTestCase):
'pfCertificationUrl=www.edx.org&' 'pfCertificationUrl=www.edx.org&'
'source=o' 'source=o'
) )
self.assertContains(response, expected_url) self.assertContains(response, escape(expected_url))
@unittest.skipUnless(settings.ROOT_URLCONF == 'lms.urls', 'Test only valid in lms') @unittest.skipUnless(settings.ROOT_URLCONF == 'lms.urls', 'Test only valid in lms')
@ddt.data(ModuleStoreEnum.Type.mongo, ModuleStoreEnum.Type.split) @ddt.data(ModuleStoreEnum.Type.mongo, ModuleStoreEnum.Type.split)
......
<%page expression_filter="h"/> <%page expression_filter="h" args="cert_status, course_overview, enrollment" />
<%page args="cert_status, course_overview, enrollment" />
<%! <%!
from django.utils.translation import ugettext as _ from django.utils.translation import ugettext as _
......
<%page expression_filter="h"/> <%page expression_filter="h" args="program_data, enrollment_mode, display_category" />
<%page args="program_data, enrollment_mode, display_category" />
<%! <%!
from django.utils.translation import ugettext as _ from django.utils.translation import ugettext as _
from openedx.core.djangolib.markup import Text, HTML from openedx.core.djangolib.markup import Text, HTML
......
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