aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework/tests/generics.py
diff options
context:
space:
mode:
authorNikolaus Schlemm2013-05-19 13:46:17 +0200
committerNikolaus Schlemm2013-05-19 13:46:17 +0200
commit5473f60192132f36bd7ed81faf6ca63cdb6526af (patch)
treea11678f8fd04b7d8a5b686611062d3bdf025a2aa /rest_framework/tests/generics.py
parent1154c12b3389c3098ee8755887f785da43666ec4 (diff)
parent08e9e2042c99cde66721a22475df6e084a06e3d2 (diff)
downloaddjango-rest-framework-5473f60192132f36bd7ed81faf6ca63cdb6526af.tar.bz2
Merge remote-tracking branch 'grimborg/issue-192-expose-fields-for-options' into issue-192-expose-fields-for-options
Diffstat (limited to 'rest_framework/tests/generics.py')
-rw-r--r--rest_framework/tests/generics.py18
1 files changed, 12 insertions, 6 deletions
diff --git a/rest_framework/tests/generics.py b/rest_framework/tests/generics.py
index a1edd28d..293c6633 100644
--- a/rest_framework/tests/generics.py
+++ b/rest_framework/tests/generics.py
@@ -128,15 +128,17 @@ class TestRootView(TestCase):
for method in ('GET', 'POST',):
expected['actions'][method] = {
'text': {
- #'description': '',
- 'label': None,
+ # TODO add help_text and label when they are available
+ #'help_text': '',
+ #'label': None,
'read_only': False,
'required': True,
'type': 'Single Character',
},
'id': {
- #'description': '',
- 'label': None,
+ # TODO add help_text and label when they are available
+ #'help_text': '',
+ #'label': None,
'read_only': True,
'required': False,
'type': 'Integer',
@@ -264,15 +266,19 @@ class TestInstanceView(TestCase):
for method in ('GET', 'PATCH', 'PUT', 'DELETE'):
expected['actions'][method] = {
'text': {
+ # TODO uncomment label and description when they are
+ # available
#'description': '',
- 'label': None,
+ #'label': None,
'read_only': False,
'required': True,
'type': 'Single Character',
},
'id': {
+ # TODO uncomment label and description when they are
+ # available
#'description': '',
- 'label': None,
+ #'label': None,
'read_only': True,
'required': False,
'type': 'Integer',