Bring back identity into permits.

5 files changed, 13 insertions, 8 deletions

diff --git a/tests/pkgs/securityapp/__init__.py b/tests/pkgs/securityapp/__init__.py
index 6c9025e7d..caf65ad4c 100644
--- a/tests/pkgs/securityapp/__init__.py
+++ b/tests/pkgs/securityapp/__init__.py
@@ -4,12 +4,12 @@ from pyramid.security import Allowed, Denied
 
 class SecurityPolicy:
     def identify(self, request):
-        raise NotImplementedError()  # pragma: no cover
+        return self.authenticated_userid(request)
 
     def authenticated_userid(self, request):
         return request.environ.get('REMOTE_USER')
 
-    def permits(self, request, context, permission):
+    def permits(self, request, context, identity, permission):
         userid = self.authenticated_userid(request)
         if userid and permission == 'foo':
             return Allowed('')
diff --git a/tests/test_config/test_views.py b/tests/test_config/test_views.py
index a474d3754..a1e975756 100644
--- a/tests/test_config/test_views.py
+++ b/tests/test_config/test_views.py
@@ -2045,9 +2045,10 @@ class TestViewsConfigurationMixin(unittest.TestCase):
                 outerself.assertEqual(r, request)
                 return 123
 
-            def permits(self, r, context, permission):
+            def permits(self, r, context, identity, permission):
                 outerself.assertEqual(r, request)
                 outerself.assertEqual(context, None)
+                outerself.assertEqual(identity, 123)
                 outerself.assertEqual(permission, 'view')
                 return True
 
@@ -2069,9 +2070,10 @@ class TestViewsConfigurationMixin(unittest.TestCase):
                 outerself.assertEqual(r, request)
                 return 123
 
-            def permits(self, r, context, permission):
+            def permits(self, r, context, identity, permission):
                 outerself.assertEqual(r, request)
                 outerself.assertEqual(context, None)
+                outerself.assertEqual(identity, 123)
                 outerself.assertEqual(permission, 'view')
                 return True
 
diff --git a/tests/test_security.py b/tests/test_security.py
index 1c969e305..3896e008d 100644
--- a/tests/test_security.py
+++ b/tests/test_security.py
@@ -480,7 +480,10 @@ class TestLegacySecurityPolicy(unittest.TestCase):
         _registerAuthenticationPolicy(request.registry, ['p1', 'p2'])
         _registerAuthorizationPolicy(request.registry, True)
 
-        self.assertTrue(policy.permits(request, request.context, 'permission'))
+        self.assertIs(
+            policy.permits(request, request.context, 'userid', 'permission'),
+            True,
+        )
 
 
 _TEST_HEADER = 'X-Pyramid-Test'
@@ -501,7 +504,7 @@ class DummySecurityPolicy:
     def authenticated_userid(self, request):
         return self.result
 
-    def permits(self, request, context, permission):
+    def permits(self, request, context, identity, permission):
         return self.result
 
     def remember(self, request, userid, **kw):
diff --git a/tests/test_testing.py b/tests/test_testing.py
index 6eb474f65..a329b0a04 100644
--- a/tests/test_testing.py
+++ b/tests/test_testing.py
@@ -33,7 +33,7 @@ class TestDummySecurityPolicy(unittest.TestCase):
 
     def test_permits(self):
         policy = self._makeOne()
-        self.assertTrue(policy.permits(None, None, None))
+        self.assertEqual(policy.permits(None, None, None, None), True)
 
     def test_forget(self):
         policy = self._makeOne()
diff --git a/tests/test_viewderivers.py b/tests/test_viewderivers.py
index f1aa00e5b..48a564c7b 100644
--- a/tests/test_viewderivers.py
+++ b/tests/test_viewderivers.py
@@ -2089,7 +2089,7 @@ class DummySecurityPolicy:
     def authenticated_userid(self, request):
         return 123
 
-    def permits(self, request, context, permission):
+    def permits(self, request, context, identity, permission):
         return self.permitted