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

Move account_settings into user_api.

Browse Source
This commit is contained in:
Diana Huang
2019-12-04 13:13:07 -05:00
parent be7df8ba9f
commit 461b11650e
6 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
openedx/core/djangoapps/user_api/legacy_urls.py
View File

@@ -9,6 +9,7 @@ from django.conf.urls import include, url
from rest_framework import routers
from . import views as user_api_views
from .accounts.settings_views import account_settings
from .models import UserPreference
USER_API_ROUTER = routers.DefaultRouter()
@@ -16,23 +17,24 @@ USER_API_ROUTER.register(r'users', user_api_views.UserViewSet)
USER_API_ROUTER.register(r'user_prefs', user_api_views.UserPreferenceViewSet)
urlpatterns = [
url(r'^v1/', include(USER_API_ROUTER.urls)),
url(r'^account/settings$', account_settings, name='account_settings'),
url(r'^user_api/v1/', include(USER_API_ROUTER.urls)),
url(
r'^v1/preferences/(?P<pref_key>{})/users/$'.format(UserPreference.KEY_REGEX),
r'^user_api/v1/preferences/(?P<pref_key>{})/users/$'.format(UserPreference.KEY_REGEX),
user_api_views.PreferenceUsersListView.as_view()
),
url(
r'^v1/forum_roles/(?P<name>[a-zA-Z]+)/users/$',
r'^user_api/v1/forum_roles/(?P<name>[a-zA-Z]+)/users/$',
user_api_views.ForumRoleUsersListView.as_view()
),
url(
r'^v1/preferences/email_opt_in/$',
r'^user_api/v1/preferences/email_opt_in/$',
user_api_views.UpdateEmailOptInPreference.as_view(),
name="preferences_email_opt_in"
),
url(
r'^v1/preferences/time_zones/$',
r'^user_api/v1/preferences/time_zones/$',
user_api_views.CountryTimeZoneListView.as_view(),
),
]

7
openedx/core/djangoapps/user_api/tests/test_views.py
View File

@@ -108,6 +108,7 @@ class UserAPITestCase(ApiTestCase):
self.assertUserIsValid(pref["user"])
@skip_unless_lms
class EmptyUserTestCase(UserAPITestCase):
"""
Test that the endpoint supports empty user result sets
@@ -120,6 +121,7 @@ class EmptyUserTestCase(UserAPITestCase):
self.assertEqual(result["results"], [])
@skip_unless_lms
class EmptyRoleTestCase(UserAPITestCase):
"""Test that the endpoint supports empty result sets"""
course_id = CourseKey.from_string("org/course/run")
@@ -154,6 +156,7 @@ class UserApiTestCase(UserAPITestCase):
]
@skip_unless_lms
class RoleTestCase(UserApiTestCase):
"""
Test cases covering Role-related views and their behaviors
@@ -243,6 +246,7 @@ class RoleTestCase(UserApiTestCase):
self.assertEqual(len(set(all_user_uris)), 5)
@skip_unless_lms
class UserViewSetTest(UserApiTestCase):
"""
Test cases covering the User DRF view set class and its various behaviors
@@ -360,6 +364,7 @@ class UserViewSetTest(UserApiTestCase):
)
@skip_unless_lms
class UserPreferenceViewSetTest(CacheIsolationTestCase, UserApiTestCase):
"""
Test cases covering the User Preference DRF view class and its various behaviors
@@ -505,6 +510,7 @@ class UserPreferenceViewSetTest(CacheIsolationTestCase, UserApiTestCase):
)
@skip_unless_lms
class PreferenceUsersListViewTest(UserApiTestCase):
"""
Test cases covering the list viewing behavior for user preferences
@@ -666,6 +672,7 @@ class UpdateEmailOptInTestCase(UserAPITestCase, SharedModuleStoreTestCase):
@ddt.ddt
@skip_unless_lms
class CountryTimeZoneListViewTest(UserApiTestCase):
"""
Test cases covering the list viewing behavior for country time zones