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

Merge pull request #18732 from edx/douglashall/upgrade_drf_extensions

Browse Source 
Upgrade edx-drf-extensions to 1.6.1.
This commit is contained in:
Douglas Hall
2018-08-07 16:05:50 -04:00
committed by GitHub
parent 02e4b87421 6e9d71f44c
commit 65d9d5411e
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
openedx/core/djangoapps/user_api/accounts/tests/test_views.py
View File

@@ -190,7 +190,7 @@ class TestOwnUsernameAPI(CacheIsolationTestCase, UserAPITestCase):
Test that a client (logged in) can get her own username.
"""
self.client.login(username=self.user.username, password=TEST_PASSWORD)
self._verify_get_own_username(15)
self._verify_get_own_username(16)
def test_get_username_inactive(self):
"""
@@ -200,7 +200,7 @@ class TestOwnUsernameAPI(CacheIsolationTestCase, UserAPITestCase):
self.client.login(username=self.user.username, password=TEST_PASSWORD)
self.user.is_active = False
self.user.save()
self._verify_get_own_username(15)
self._verify_get_own_username(16)
def test_get_username_not_logged_in(self):
"""
@@ -321,7 +321,7 @@ class TestAccountsAPI(CacheIsolationTestCase, UserAPITestCase):
"""
self.different_client.login(username=self.different_user.username, password=TEST_PASSWORD)
self.create_mock_profile(self.user)
with self.assertNumQueries(20):
with self.assertNumQueries(21):
response = self.send_get(self.different_client)
self._verify_full_shareable_account_response(response, account_privacy=ALL_USERS_VISIBILITY)
@@ -336,7 +336,7 @@ class TestAccountsAPI(CacheIsolationTestCase, UserAPITestCase):
"""
self.different_client.login(username=self.different_user.username, password=TEST_PASSWORD)
self.create_mock_profile(self.user)
with self.assertNumQueries(20):
with self.assertNumQueries(21):
response = self.send_get(self.different_client)
self._verify_private_account_response(response, account_privacy=PRIVATE_VISIBILITY)
@@ -411,12 +411,12 @@ class TestAccountsAPI(CacheIsolationTestCase, UserAPITestCase):
self.assertEqual(False, data["accomplishments_shared"])
self.client.login(username=self.user.username, password=TEST_PASSWORD)
verify_get_own_information(18)
verify_get_own_information(19)
# Now make sure that the user can get the same information, even if not active
self.user.is_active = False
self.user.save()
verify_get_own_information(12)
verify_get_own_information(13)
def test_get_account_empty_string(self):
"""
@@ -430,7 +430,7 @@ class TestAccountsAPI(CacheIsolationTestCase, UserAPITestCase):
legacy_profile.save()
self.client.login(username=self.user.username, password=TEST_PASSWORD)
with self.assertNumQueries(18):
with self.assertNumQueries(19):
response = self.send_get(self.client)
for empty_field in ("level_of_education", "gender", "country", "bio"):
self.assertIsNone(response.data[empty_field])

2
requirements/edx/base.txt
View File

@@ -115,7 +115,7 @@ edx-completion==0.1.8
edx-django-oauth2-provider==1.3.4
edx-django-release-util==0.3.1
edx-django-sites-extensions==2.3.1
edx-drf-extensions==1.5.5
edx-drf-extensions==1.6.1
edx-enterprise==0.72.2
edx-i18n-tools==0.4.6
edx-milestones==0.1.13

2
requirements/edx/development.txt
View File

@@ -135,7 +135,7 @@ edx-completion==0.1.8
edx-django-oauth2-provider==1.3.4
edx-django-release-util==0.3.1
edx-django-sites-extensions==2.3.1
edx-drf-extensions==1.5.2
edx-drf-extensions==1.6.1
edx-enterprise==0.72.2
edx-i18n-tools==0.4.6
edx-lint==0.5.5

2
requirements/edx/testing.txt
View File

@@ -130,7 +130,7 @@ edx-completion==0.1.8
edx-django-oauth2-provider==1.3.4
edx-django-release-util==0.3.1
edx-django-sites-extensions==2.3.1
edx-drf-extensions==1.5.2
edx-drf-extensions==1.6.1
edx-enterprise==0.72.2
edx-i18n-tools==0.4.6
edx-lint==0.5.5