Update cms urls for language preferences
This commit is contained in:
committed by
Julia Hansbrough
parent
05537540d1
commit
ff0a6fb778
@@ -38,6 +38,7 @@ urlpatterns = patterns('', # nopep8
|
||||
url(r'^heartbeat$', include('heartbeat.urls')),
|
||||
|
||||
url(r'^user_api/', include('user_api.urls')),
|
||||
url(r'^lang_pref/', include('lang_pref.urls')),
|
||||
)
|
||||
|
||||
# User creation and updating views
|
||||
|
||||
@@ -7,6 +7,7 @@ from student.tests.factories import UserFactory
|
||||
from user_api.models import UserPreference
|
||||
from lang_pref import LANGUAGE_KEY
|
||||
|
||||
|
||||
class TestLanguageSetting(TestCase):
|
||||
"""
|
||||
Test setting languages
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
Urls for managing language preferences
|
||||
"""
|
||||
|
||||
from django.conf.urls import patterns, url
|
||||
from django.conf.urls import patterns, url
|
||||
|
||||
urlpatterns = patterns(
|
||||
'',
|
||||
|
||||
@@ -7,6 +7,7 @@ from django.http import HttpResponse, HttpResponseBadRequest
|
||||
from user_api.models import UserPreference
|
||||
from lang_pref import LANGUAGE_KEY
|
||||
|
||||
|
||||
@login_required
|
||||
def set_language(request):
|
||||
"""
|
||||
|
||||
@@ -74,14 +74,12 @@ class LanguageTest(UniqueCourseTest):
|
||||
"""
|
||||
Tests that the change language functionality on the dashboard works
|
||||
"""
|
||||
|
||||
|
||||
@property
|
||||
def _changed_lang_promise(self):
|
||||
|
||||
def _check_func():
|
||||
text = self.dashboard_page.current_courses_text
|
||||
return (len(text) > 0, text)
|
||||
|
||||
return Promise(_check_func, "language changed")
|
||||
|
||||
def setUp(self):
|
||||
@@ -106,8 +104,10 @@ class LanguageTest(UniqueCourseTest):
|
||||
self.dashboard_page.visit()
|
||||
# Change language to Dummy Esperanto
|
||||
self.dashboard_page.change_language(self.test_new_lang)
|
||||
|
||||
changed_text = fulfill(self._changed_lang_promise)
|
||||
# We should see the dummy-language text on the page
|
||||
self.assertTrue(self.browser.is_text_present(self.current_courses_text))
|
||||
self.assertIn(self.current_courses_text, changed_text)
|
||||
|
||||
def test_language_persists(self):
|
||||
auto_auth_page = AutoAuthPage(self.browser, username=self.username, password=self.password, email=self.email, course_id=self.course_id)
|
||||
|
||||
Reference in New Issue
Block a user