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

Merge 38c53cf210 into f404fda29c

Browse Source
This commit is contained in:
Daniel Hahler 2018-07-10 14:35:45 +00:00 committed by GitHub
commit 2affe4dc10
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
rest_framework/decorators.py
View File

@ -154,9 +154,10 @@ def action(methods=None, detail=None, name=None, url_path=None, url_name=None, *
func.url_name = url_name if url_name else func.__name__.replace('_', '-') func.url_name = url_name if url_name else func.__name__.replace('_', '-')
func.kwargs = kwargs func.kwargs = kwargs
func.kwargs.update({ func.kwargs.update({
'name': func.name,
'description': func.__doc__ or None 'description': func.__doc__ or None
}) })
if 'suffix' not in kwargs:
func.kwargs['name'] = func.name
return func return func
return decorator return decorator

10
tests/test_decorators.py
View File

@ -187,6 +187,16 @@ class ActionDecoratorTestCase(TestCase):
'description': 'Description', 'description': 'Description',
} }
def test_detail_suffix(self):
@action(detail=True, suffix='Suffix')
def test_action(request):
raise NotImplementedError
assert test_action.kwargs == {
'description': None,
'suffix': 'Suffix',
}
def test_detail_required(self): def test_detail_required(self):
with pytest.raises(AssertionError) as excinfo: with pytest.raises(AssertionError) as excinfo:
@action() @action()