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

Merge 4cd9e8a263 into 836e49b535

Browse Source
This commit is contained in:
Kaleb Elwert 2017-06-06 15:22:29 +00:00 committed by GitHub
commit 773e731916
2 changed files with 124 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
rest_framework/schemas.py
View File

@ -649,9 +649,8 @@ class SchemaGenerator(object):
action = self.default_mapping[method.lower()] action = self.default_mapping[method.lower()]
named_path_components = [ named_path_components = [
component for component component.strip('{}') for component
in subpath.strip('/').split('/') in subpath.strip('/').split('/')
if '{' not in component
] ]
if is_custom_action(action): if is_custom_action(action):

87
tests/test_schemas.py
View File

@ -115,6 +115,7 @@ class TestRouterGeneratedSchema(TestCase):
action='get' action='get'
) )
}, },
'id': {
'read': coreapi.Link( 'read': coreapi.Link(
url='/example/{id}/', url='/example/{id}/',
action='get', action='get',
@ -122,6 +123,7 @@ class TestRouterGeneratedSchema(TestCase):
coreapi.Field('id', required=True, location='path', schema=coreschema.String()) coreapi.Field('id', required=True, location='path', schema=coreschema.String())
] ]
) )
},
} }
} }
) )
@ -155,24 +157,6 @@ class TestRouterGeneratedSchema(TestCase):
coreapi.Field('b', required=False, location='form', schema=coreschema.String(title='B')) coreapi.Field('b', required=False, location='form', schema=coreschema.String(title='B'))
] ]
), ),
'read': coreapi.Link(
url='/example/{id}/',
action='get',
fields=[
coreapi.Field('id', required=True, location='path', schema=coreschema.String())
]
),
'custom_action': coreapi.Link(
url='/example/{id}/custom_action/',
action='post',
encoding='application/json',
description='A description of custom action.',
fields=[
coreapi.Field('id', required=True, location='path', schema=coreschema.String()),
coreapi.Field('c', required=True, location='form', schema=coreschema.String(title='C')),
coreapi.Field('d', required=False, location='form', schema=coreschema.String(title='D')),
]
),
'custom_list_action': coreapi.Link( 'custom_list_action': coreapi.Link(
url='/example/custom_list_action/', url='/example/custom_list_action/',
action='get' action='get'
@ -187,6 +171,14 @@ class TestRouterGeneratedSchema(TestCase):
action='post' action='post'
) )
}, },
'id': {
'read': coreapi.Link(
url='/example/{id}/',
action='get',
fields=[
coreapi.Field('id', required=True, location='path', schema=coreschema.String())
]
),
'update': coreapi.Link( 'update': coreapi.Link(
url='/example/{id}/', url='/example/{id}/',
action='put', action='put',
@ -213,7 +205,19 @@ class TestRouterGeneratedSchema(TestCase):
fields=[ fields=[
coreapi.Field('id', required=True, location='path', schema=coreschema.String()) coreapi.Field('id', required=True, location='path', schema=coreschema.String())
] ]
) ),
'custom_action': coreapi.Link(
url='/example/{id}/custom_action/',
action='post',
encoding='application/json',
description='A description of custom action.',
fields=[
coreapi.Field('id', required=True, location='path', schema=coreschema.String()),
coreapi.Field('c', required=True, location='form', schema=coreschema.String(title='C')),
coreapi.Field('d', required=False, location='form', schema=coreschema.String(title='D')),
]
),
}
} }
} }
) )
@ -298,6 +302,7 @@ class TestSchemaGenerator(TestCase):
action='get', action='get',
fields=[] fields=[]
), ),
'id': {
'read': coreapi.Link( 'read': coreapi.Link(
url='/example/{id}/', url='/example/{id}/',
action='get', action='get',
@ -316,6 +321,7 @@ class TestSchemaGenerator(TestCase):
} }
} }
} }
}
) )
assert schema == expected assert schema == expected
@ -351,6 +357,7 @@ class TestSchemaGeneratorNotAtRoot(TestCase):
action='get', action='get',
fields=[] fields=[]
), ),
'id': {
'read': coreapi.Link( 'read': coreapi.Link(
url='/api/v1/example/{id}/', url='/api/v1/example/{id}/',
action='get', action='get',
@ -369,6 +376,48 @@ class TestSchemaGeneratorNotAtRoot(TestCase):
} }
} }
} }
}
)
assert schema == expected
@unittest.skipUnless(coreapi, 'coreapi is not installed')
class TestSchemaGeneratorWithOverlappingKeys(TestCase):
def setUp(self):
self.patterns = [
url('^api/v1/example/(?P<pk>\d+)/?$', ExampleDetailView.as_view()),
url('^api/v1/example/(?P<pk>\d+)/(?P<id2>\d+)/?$', ExampleDetailView.as_view()),
]
def test_schema_for_regular_views(self):
generator = SchemaGenerator(title='Example API', patterns=self.patterns)
schema = generator.get_schema()
expected = coreapi.Document(
url='',
title='Example API',
content={
'example': {
'id': {
'read': coreapi.Link(
url='/api/v1/example/{id}/',
action='get',
fields=[
coreapi.Field('id', required=True, location='path', schema=coreschema.String())
]
),
'id2': {
'read': coreapi.Link(
url='/api/v1/example/{id}/{id2}/',
action='get',
fields=[
coreapi.Field('id', required=True, location='path', schema=coreschema.String()),
coreapi.Field('id2', required=True, location='path', schema=coreschema.String())
]
)
}
}
}
}
) )
assert schema == expected assert schema == expected