Reapply "Merge pull request #14868 from cpennington/learner-542"

This reverts commit 65f13ddec4.

lms/djangoapps/courseware/tests/test_course_info.py

@@ -367,7 +367,7 @@ class SelfPacedCourseInfoTestCase(LoginEnrollmentTestCase, SharedModuleStoreTest
         self.assertEqual(resp.status_code, 200)
 
     def test_num_queries_instructor_paced(self):
-        self.fetch_course_info_with_queries(self.instructor_paced_course, 21, 4)
+        self.fetch_course_info_with_queries(self.instructor_paced_course, 24, 4)
 
     def test_num_queries_self_paced(self):
-        self.fetch_course_info_with_queries(self.self_paced_course, 21, 4)
+        self.fetch_course_info_with_queries(self.self_paced_course, 24, 4)

lms/djangoapps/courseware/tests/test_i18n.py

@@ -2,6 +2,7 @@
 Tests i18n in courseware
 """
 
+import json
 import re
 
 from django.conf import settings
@@ -14,8 +15,6 @@ from nose.plugins.attrib import attr
 
 from openedx.core.djangoapps.dark_lang.models import DarkLangConfig
 from openedx.core.djangoapps.lang_pref import LANGUAGE_KEY
-from openedx.core.djangoapps.user_api.preferences.api import set_user_preference
-from student.models import UserProfile
 from student.tests.factories import UserFactory
 
 
@@ -61,8 +60,7 @@ class BaseI18nTestCase(TestCase):
         """
         # Create one user and save it to the database
         email = 'test@edx.org'
-        self.user = UserFactory.build(username='test', email=email, password=self.pwd)
-        self.user.save()
+        self.user = UserFactory.create(username='test', email=email, password=self.pwd)
 
     def user_login(self):
         """
@@ -119,7 +117,6 @@ class I18nRegressionTests(BaseI18nTestCase):
 
     def test_unreleased_lang_resolution(self):
         # Regression test; LOC-85
-        UserProfile.objects.create(user=self.user)
         self.release_languages('fa')
         self.user_login()
 
@@ -136,7 +133,6 @@ class I18nRegressionTests(BaseI18nTestCase):
         self.assert_tag_has_attr(response.content, "html", "lang", "fa-ir")
 
     def test_preview_lang(self):
-        UserProfile.objects.create(user=self.user)
         self.user_login()
 
         # Regression test; LOC-87
@@ -172,9 +168,17 @@ class I18nLangPrefTests(BaseI18nTestCase):
     """
     def setUp(self):
         super(I18nLangPrefTests, self).setUp()
-        UserProfile.objects.create(user=self.user)
         self.user_login()
 
+    def set_lang_preference(self, language):
+        """Sets the user's language preference, allowing the LangPref middleware to operate to set the preference cookie."""
+        response = self.client.patch(
+            reverse('preferences_api', args=[self.user.username]),
+            json.dumps({LANGUAGE_KEY: language}),
+            content_type="application/merge-patch+json"
+        )
+        self.assertEqual(response.status_code, 204)
+
     def test_lang_preference(self):
         # Regression test; LOC-87
         self.release_languages('ar, es-419')
@@ -184,13 +188,13 @@ class I18nLangPrefTests(BaseI18nTestCase):
         self.assert_tag_has_attr(response.content, "html", "lang", self.site_lang)
 
         # Set user language preference
-        set_user_preference(self.user, LANGUAGE_KEY, 'ar')
+        self.set_lang_preference('ar')
         # and verify we now get an ar response
         response = self.client.get(self.url)
         self.assert_tag_has_attr(response.content, "html", "lang", 'ar')
 
         # Verify that switching language preference gives the right language
-        set_user_preference(self.user, LANGUAGE_KEY, 'es-419')
+        self.set_lang_preference('es-419')
         response = self.client.get(self.url)
         self.assert_tag_has_attr(response.content, "html", "lang", 'es-419')
 
@@ -199,7 +203,7 @@ class I18nLangPrefTests(BaseI18nTestCase):
         self.release_languages('ar, es-419')
 
         # Set user language preference
-        set_user_preference(self.user, LANGUAGE_KEY, 'ar')
+        self.set_lang_preference('ar')
         # Verify preview-lang takes precedence
         self.client.post(self.preview_language_url, {'preview_lang': 'eo', 'set_language': 'set_language'})
         response = self.client.get(self.url)