Merge branch 'issue-192-expose-fields-for-options' of github.com:grimborg/django-rest-framework into issue-192-expose-fields-for-options

This commit is contained in:
Oscar Vilaplana 2013-05-19 14:00:14 +02:00
commit 400fd6bee4

View File

@ -125,8 +125,8 @@ class TestRootView(TestCase):
'actions': {}
}
# TODO: this is just a draft for fields' metadata - needs review and decision
for method in ('GET', 'POST',):
expected['actions'][method] = {
expected['actions']['GET'] = {}
expected['actions']['POST'] = {
'text': {
# TODO add help_text and label when they are available
#'help_text': '',
@ -263,7 +263,9 @@ class TestInstanceView(TestCase):
'actions': {}
}
# TODO: this is just a draft idea for fields' metadata - needs review and decision
for method in ('GET', 'PATCH', 'PUT', 'DELETE'):
for method in ('GET', 'DELETE'):
expected['actions'][method] = {}
for method in ('PATCH', 'PUT'):
expected['actions'][method] = {
'text': {
# TODO uncomment label and description when they are