Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-platform
Commits
0eed96c2
Commit
0eed96c2
authored
Mar 04, 2015
by
Christina Roberts
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #7215 from edx/christina/full_name_bug
Correctly point to MAX_LENGTH instead of MIN_LENGTH.
parents
1baaf724
167bd05a
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
27 additions
and
6 deletions
+27
-6
common/test/acceptance/pages/lms/dashboard.py
+15
-0
common/test/acceptance/tests/lms/test_lms.py
+4
-0
openedx/core/djangoapps/user_api/api/profile.py
+5
-0
openedx/core/djangoapps/user_api/tests/test_views.py
+2
-3
openedx/core/djangoapps/user_api/views.py
+1
-3
No files found.
common/test/acceptance/pages/lms/dashboard.py
View file @
0eed96c2
...
@@ -51,6 +51,21 @@ class DashboardPage(PageObject):
...
@@ -51,6 +51,21 @@ class DashboardPage(PageObject):
return
self
.
q
(
css
=
'section.info > hgroup > h3 > a'
)
.
map
(
_get_course_name
)
.
results
return
self
.
q
(
css
=
'section.info > hgroup > h3 > a'
)
.
map
(
_get_course_name
)
.
results
@property
def
full_name
(
self
):
"""Return the displayed value for the user's full name"""
return
self
.
q
(
css
=
'li.info--username .data'
)
.
text
[
0
]
@property
def
email
(
self
):
"""Return the displayed value for the user's email address"""
return
self
.
q
(
css
=
'li.info--email .data'
)
.
text
[
0
]
@property
def
username
(
self
):
"""Return the displayed value for the user's username"""
return
self
.
q
(
css
=
'h1.user-name'
)
.
text
[
0
]
def
get_enrollment_mode
(
self
,
course_name
):
def
get_enrollment_mode
(
self
,
course_name
):
"""Get the enrollment mode for a given course on the dashboard.
"""Get the enrollment mode for a given course on the dashboard.
...
...
common/test/acceptance/tests/lms/test_lms.py
View file @
0eed96c2
...
@@ -170,6 +170,10 @@ class RegisterFromCombinedPageTest(UniqueCourseTest):
...
@@ -170,6 +170,10 @@ class RegisterFromCombinedPageTest(UniqueCourseTest):
course_names
=
self
.
dashboard_page
.
wait_for_page
()
.
available_courses
course_names
=
self
.
dashboard_page
.
wait_for_page
()
.
available_courses
self
.
assertIn
(
self
.
course_info
[
"display_name"
],
course_names
)
self
.
assertIn
(
self
.
course_info
[
"display_name"
],
course_names
)
self
.
assertEqual
(
"Test User"
,
self
.
dashboard_page
.
full_name
)
self
.
assertEqual
(
email
,
self
.
dashboard_page
.
email
)
self
.
assertEqual
(
username
,
self
.
dashboard_page
.
username
)
def
test_register_failure
(
self
):
def
test_register_failure
(
self
):
# Navigate to the registration page
# Navigate to the registration page
self
.
register_page
.
visit
()
self
.
register_page
.
visit
()
...
...
openedx/core/djangoapps/user_api/api/profile.py
View file @
0eed96c2
...
@@ -14,6 +14,7 @@ from pytz import UTC
...
@@ -14,6 +14,7 @@ from pytz import UTC
import
analytics
import
analytics
from
eventtracking
import
tracker
from
eventtracking
import
tracker
from
..accounts
import
NAME_MIN_LENGTH
from
..accounts.views
import
AccountView
from
..accounts.views
import
AccountView
from
..models
import
User
,
UserPreference
,
UserOrgTag
from
..models
import
User
,
UserPreference
,
UserOrgTag
from
..helpers
import
intercept_errors
from
..helpers
import
intercept_errors
...
@@ -36,6 +37,10 @@ class ProfileInternalError(Exception):
...
@@ -36,6 +37,10 @@ class ProfileInternalError(Exception):
pass
pass
FULL_NAME_MAX_LENGTH
=
255
FULL_NAME_MIN_LENGTH
=
NAME_MIN_LENGTH
@intercept_errors
(
ProfileInternalError
,
ignore_errors
=
[
ProfileRequestError
])
@intercept_errors
(
ProfileInternalError
,
ignore_errors
=
[
ProfileRequestError
])
def
preference_info
(
username
):
def
preference_info
(
username
):
"""Retrieve information about a user's preferences.
"""Retrieve information about a user's preferences.
...
...
openedx/core/djangoapps/user_api/tests/test_views.py
View file @
0eed96c2
...
@@ -28,7 +28,6 @@ from ..api import account as account_api, profile as profile_api
...
@@ -28,7 +28,6 @@ from ..api import account as account_api, profile as profile_api
from
..models
import
UserOrgTag
from
..models
import
UserOrgTag
from
..tests.factories
import
UserPreferenceFactory
from
..tests.factories
import
UserPreferenceFactory
from
..tests.test_constants
import
SORTED_COUNTRIES
from
..tests.test_constants
import
SORTED_COUNTRIES
from
openedx.core.djangoapps.user_api.accounts
import
NAME_MIN_LENGTH
TEST_API_KEY
=
"test_api_key"
TEST_API_KEY
=
"test_api_key"
...
@@ -842,7 +841,7 @@ class RegistrationViewTest(ApiTestCase):
...
@@ -842,7 +841,7 @@ class RegistrationViewTest(ApiTestCase):
u"label"
:
u"Full name"
,
u"label"
:
u"Full name"
,
u"instructions"
:
u"The name that will appear on your certificates"
,
u"instructions"
:
u"The name that will appear on your certificates"
,
u"restrictions"
:
{
u"restrictions"
:
{
"max_length"
:
NAME_MIN
_LENGTH
,
"max_length"
:
profile_api
.
FULL_NAME_MAX
_LENGTH
,
},
},
}
}
)
)
...
@@ -922,7 +921,7 @@ class RegistrationViewTest(ApiTestCase):
...
@@ -922,7 +921,7 @@ class RegistrationViewTest(ApiTestCase):
u"label"
:
u"Full name"
,
u"label"
:
u"Full name"
,
u"instructions"
:
u"The name that will appear on your certificates"
,
u"instructions"
:
u"The name that will appear on your certificates"
,
u"restrictions"
:
{
u"restrictions"
:
{
"max_length"
:
NAME_MIN_LENGTH
"max_length"
:
profile_api
.
FULL_NAME_MAX_LENGTH
,
}
}
}
}
)
)
...
...
openedx/core/djangoapps/user_api/views.py
View file @
0eed96c2
...
@@ -33,8 +33,6 @@ from .helpers import FormDescription, shim_student_view, require_post_params
...
@@ -33,8 +33,6 @@ from .helpers import FormDescription, shim_student_view, require_post_params
from
.models
import
UserPreference
,
UserProfile
from
.models
import
UserPreference
,
UserProfile
from
.serializers
import
UserSerializer
,
UserPreferenceSerializer
from
.serializers
import
UserSerializer
,
UserPreferenceSerializer
from
openedx.core.djangoapps.user_api.accounts
import
NAME_MIN_LENGTH
class
LoginSessionView
(
APIView
):
class
LoginSessionView
(
APIView
):
"""HTTP end-points for logging in users. """
"""HTTP end-points for logging in users. """
...
@@ -352,7 +350,7 @@ class RegistrationView(APIView):
...
@@ -352,7 +350,7 @@ class RegistrationView(APIView):
label
=
name_label
,
label
=
name_label
,
instructions
=
name_instructions
,
instructions
=
name_instructions
,
restrictions
=
{
restrictions
=
{
"max_length"
:
NAME_MIN
_LENGTH
,
"max_length"
:
profile_api
.
FULL_NAME_MAX
_LENGTH
,
},
},
required
=
required
required
=
required
)
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment