Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean up tests.

Browse Source
This commit is contained in:
thedeadparrot
2014-02-14 08:37:12 -05:00
committed by Julia Hansbrough
parent cb209fa0af
commit 48686793d7
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
common/djangoapps/student/views.py
View File

@@ -27,7 +27,6 @@ from django.http import (HttpResponse, HttpResponseBadRequest, HttpResponseForbi
from django.shortcuts import redirect
from django_future.csrf import ensure_csrf_cookie
from django.utils.http import cookie_date, base36_to_int
from django.utils import translation
from django.utils.translation import ugettext as _
from django.views.decorators.http import require_POST, require_GET

1
common/djangoapps/user_api/models.py
View File

@@ -1,6 +1,7 @@
from django.contrib.auth.models import User
from django.db import models
# this is the UserPreference key for the user's preferred language
LANGUAGE_KEY = 'pref-lang'

3
common/djangoapps/user_api/tests/test_middleware.py
View File

@@ -14,10 +14,9 @@ class TestUserPreferenceMiddleware(TestCase):
def setUp(self):
self.middleware = UserPreferenceMiddleware()
self.request_factory = RequestFactory()
self.session_middleware = SessionMiddleware()
self.user = UserFactory.create()
self.request = self.request_factory.get('/somewhere')
self.request = RequestFactory().get('/somewhere')
self.request.user = self.user
self.session_middleware.process_request(self.request)

19
common/test/acceptance/tests/test_lms.py
View File

@@ -82,16 +82,18 @@ class LanguageTest(UniqueCourseTest):
super(LanguageTest, self).setUp()
self.dashboard_page = DashboardPage(self.browser)
self.test_new_lang = 'eo'
# This string is unicode for "ÇÜRRÉNT ÇØÜRSÉS", which should appear in our Dummy Esperanto page
self.current_courses_text = u"\xc7\xdcRR\xc9NT \xc7\xd8\xdcRS\xc9S"
def test_change_lang(self):
AutoAuthPage(self.browser, course_id=self.course_id).visit()
self.dashboard_page.visit()
# Change language to Dummy Esperanto
self.dashboard_page.change_language("eo")
self.dashboard_page.change_language(self.test_new_lang)
# This string is unicode for "ÇÜRRÉNT ÇØÜRSÉS", which should appear in our Dummy Esperanto page
seektext = u"\xc7\xdcRR\xc9NT \xc7\xd8\xdcRS\xc9S"
self.browser.is_text_present(seektext)
self.assertTrue(self.browser.is_text_present(seektext))
self.browser.is_text_present(self.current_courses_text)
self.assertTrue(self.browser.is_text_present(self.current_courses_text))
def test_language_persists(self):
auto_auth_page = AutoAuthPage(self.browser, course_id=self.course_id)
@@ -99,7 +101,7 @@ class LanguageTest(UniqueCourseTest):
self.dashboard_page.visit()
# Change language to Dummy Esperanto
self.dashboard_page.change_language("eo")
self.dashboard_page.change_language(self.test_new_lang)
# destroy session
self.browser._cookie_manager.delete()
@@ -109,9 +111,8 @@ class LanguageTest(UniqueCourseTest):
self.dashboard_page.visit()
# This string is unicode for "ÇÜRRÉNT ÇØÜRSÉS", which should appear in our Dummy Esperanto page
seektext = u"\xc7\xdcRR\xc9NT \xc7\xd8\xdcRS\xc9S"
self.browser.is_text_present(seektext)
self.assertTrue(self.browser.is_text_present(seektext))
self.browser.is_text_present(self.current_courses_text)
self.assertTrue(self.browser.is_text_present(self.current_courses_text))
class HighLevelTabTest(UniqueCourseTest):