encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-02-20 05:20:56 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'grimborg/issue-192-expose-fields-for-options' into issue-192-expose-fields-for-options

Browse Source
This commit is contained in:
Nikolaus Schlemm 2013-05-19 13:46:17 +02:00
commit 5473f60192
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
rest_framework/tests/generics.py
View File

@ -128,15 +128,17 @@ class TestRootView(TestCase):
for method in ('GET', 'POST',): for method in ('GET', 'POST',):
expected['actions'][method] = { expected['actions'][method] = {
'text': { 'text': {
#'description': '', # TODO add help_text and label when they are available
'label': None, #'help_text': '',
#'label': None,
'read_only': False, 'read_only': False,
'required': True, 'required': True,
'type': 'Single Character', 'type': 'Single Character',
}, },
'id': { 'id': {
#'description': '', # TODO add help_text and label when they are available
'label': None, #'help_text': '',
#'label': None,
'read_only': True, 'read_only': True,
'required': False, 'required': False,
'type': 'Integer', 'type': 'Integer',
@ -264,15 +266,19 @@ class TestInstanceView(TestCase):
for method in ('GET', 'PATCH', 'PUT', 'DELETE'): for method in ('GET', 'PATCH', 'PUT', 'DELETE'):
expected['actions'][method] = { expected['actions'][method] = {
'text': { 'text': {
# TODO uncomment label and description when they are
# available
#'description': '', #'description': '',
'label': None, #'label': None,
'read_only': False, 'read_only': False,
'required': True, 'required': True,
'type': 'Single Character', 'type': 'Single Character',
}, },
'id': { 'id': {
# TODO uncomment label and description when they are
# available
#'description': '', #'description': '',
'label': None, #'label': None,
'read_only': True, 'read_only': True,
'required': False, 'required': False,
'type': 'Integer', 'type': 'Integer',