Test decorated extra action

Author: rpkilby

tests/test_viewsets.py

@@ -33,6 +33,12 @@ class Action(models.Model):
     pass
 
 
+def decorate(fn):
+    def wrapper(self, request, *args, **kwargs):
+        return fn(self, request, *args, **kwargs)
+    return wrapper
+
+
 class ActionViewSet(GenericViewSet):
     queryset = Action.objects.all()
 
@@ -62,6 +68,16 @@ def custom_detail_action(self, request, *args, **kwargs):
     def unresolvable_detail_action(self, request, *args, **kwargs):
         raise NotImplementedError
 
+    @action(detail=False)
+    @decorate
+    def wrapped_list_action(self, request, *args, **kwargs):
+        raise NotImplementedError
+
+    @action(detail=True)
+    @decorate
+    def wrapped_detail_action(self, request, *args, **kwargs):
+        raise NotImplementedError
+
 
 class ActionNamesViewSet(GenericViewSet):
 
@@ -157,6 +173,8 @@ def test_extra_actions(self):
             'detail_action',
             'list_action',
             'unresolvable_detail_action',
+            'wrapped_list_action',
+            'wrapped_detail_action',
         ]
 
         self.assertEqual(actual, expected)
@@ -172,6 +190,7 @@ def test_list_view(self):
         expected = OrderedDict([
             ('Custom list action', 'http://testserver/api/actions/custom_list_action/'),
             ('List action', 'http://testserver/api/actions/list_action/'),
+            ('Wrapped list action', 'http://testserver/api/actions/wrapped_list_action/'),
         ])
 
         self.assertEqual(view.get_extra_action_url_map(), expected)
@@ -183,6 +202,7 @@ def test_detail_view(self):
         expected = OrderedDict([
             ('Custom detail action', 'http://testserver/api/actions/1/custom_detail_action/'),
             ('Detail action', 'http://testserver/api/actions/1/detail_action/'),
+            ('Wrapped detail action', 'http://testserver/api/actions/wrapped_detail_action/'),
             # "Unresolvable detail action" excluded, since it's not resolvable
         ])