Add positional argument handling for test_view_decorator

anthony-tresontani · Jul 12, 2012 · 99d173b · 99d173b
1 parent 5b581e9
commit 99d173b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/rules/base.py b/rules/base.py
@@ -206,7 +206,9 @@ def get_view_decorator(action):
     def decorator(fn=None, deny=lambda x:""):
         if fn:
             def wrapped(self, *arg, **kwargs):
-                request = kwargs['request']
+                request = kwargs.get('request', None)
+                if not request:
+                    request = arg[0]
                 user = getattr(request, "user", None)
                 if IsRuleMatching(on=self, action=action, for_=user).check():
                     val = fn(self, *arg, **kwargs)

diff --git a/tests/tests.py b/tests/tests.py
@@ -187,27 +187,34 @@ def setUp(self):
 
         can_see_content = get_view_decorator("see_content")
         @can_see_content
-        def test_view(self, **kwargs): 
+        def test_view(self, *args, **kwargs): 
             return "content"
 
         @can_see_content(deny=lambda x: "deny")
-        def test_view_arg(self, **kwargs): 
+        def test_view_arg(self, *args, **kwargs): 
             return "content"
 
         self.test_view = test_view
         self.test_view_arg = test_view_arg
         self.self_fct = ""
 
     def test_decorator_no_args(self):
-        kwargs = {"request": None}
+        kwargs = {"request": "req"}
         assert_that( self.test_view(self.self_fct, **kwargs), is_(""))
 
     def test_decorator_with_args(self):
-        kwargs = {"request": None}
+        kwargs = {"request": "req"}
         assert_that( self.test_view_arg(self.self_fct, **kwargs), is_("deny"))
 
     def test_decorator_valid(self):
         kwargs = {"request": MockRequest("logged")}
         assert_that( self.test_view(self.self_fct, **kwargs), is_("content"))
 
 
+    def test_decorator_in_class_based_view(self):
+        """
+           pass request as a positional args
+        """
+        assert_that( self.test_view(self.self_fct, MockRequest("logged")), is_("content"))
+
+