From 32bf9b3669f2ba0c4a0aaf35f4e2cdad8f9314f0 Mon Sep 17 00:00:00 2001
From: Theron Luhn <theron@luhn.com>
Date: Sun, 15 Dec 2019 19:55:10 -0800
Subject: Revert "Bring back identity into permits."

This reverts commit 2e06fa414412688dc3b7e0b422b0fc0b96ec882f.
---
 tests/pkgs/securityapp/__init__.py | 4 ++--
 tests/test_config/test_views.py    | 6 ++----
 tests/test_security.py             | 7 ++-----
 tests/test_testing.py              | 2 +-
 tests/test_viewderivers.py         | 2 +-
 5 files changed, 8 insertions(+), 13 deletions(-)

(limited to 'tests')

diff --git a/tests/pkgs/securityapp/__init__.py b/tests/pkgs/securityapp/__init__.py
index caf65ad4c..6c9025e7d 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):
-        return self.authenticated_userid(request)
+        raise NotImplementedError()  # pragma: no cover
 
     def authenticated_userid(self, request):
         return request.environ.get('REMOTE_USER')
 
-    def permits(self, request, context, identity, permission):
+    def permits(self, request, context, 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 a1e975756..a474d3754 100644
--- a/tests/test_config/test_views.py
+++ b/tests/test_config/test_views.py
@@ -2045,10 +2045,9 @@ class TestViewsConfigurationMixin(unittest.TestCase):
                 outerself.assertEqual(r, request)
                 return 123
 
-            def permits(self, r, context, identity, permission):
+            def permits(self, r, context, permission):
                 outerself.assertEqual(r, request)
                 outerself.assertEqual(context, None)
-                outerself.assertEqual(identity, 123)
                 outerself.assertEqual(permission, 'view')
                 return True
 
@@ -2070,10 +2069,9 @@ class TestViewsConfigurationMixin(unittest.TestCase):
                 outerself.assertEqual(r, request)
                 return 123
 
-            def permits(self, r, context, identity, permission):
+            def permits(self, r, context, 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 a555fd7f6..f39e3c730 100644
--- a/tests/test_security.py
+++ b/tests/test_security.py
@@ -489,10 +489,7 @@ class TestLegacySecurityPolicy(unittest.TestCase):
         _registerAuthenticationPolicy(request.registry, ['p1', 'p2'])
         _registerAuthorizationPolicy(request.registry, True)
 
-        self.assertIs(
-            policy.permits(request, request.context, 'userid', 'permission'),
-            True,
-        )
+        self.assertTrue(policy.permits(request, request.context, 'permission'))
 
 
 _TEST_HEADER = 'X-Pyramid-Test'
@@ -513,7 +510,7 @@ class DummySecurityPolicy:
     def authenticated_userid(self, request):
         return self.result
 
-    def permits(self, request, context, identity, permission):
+    def permits(self, request, context, permission):
         return self.result
 
     def remember(self, request, userid, **kw):
diff --git a/tests/test_testing.py b/tests/test_testing.py
index 22bc7332b..be519cd15 100644
--- a/tests/test_testing.py
+++ b/tests/test_testing.py
@@ -37,7 +37,7 @@ class TestDummySecurityPolicy(unittest.TestCase):
 
     def test_permits(self):
         policy = self._makeOne()
-        self.assertEqual(policy.permits(None, None, None, None), True)
+        self.assertTrue(policy.permits(None, None, None))
 
     def test_forget(self):
         policy = self._makeOne()
diff --git a/tests/test_viewderivers.py b/tests/test_viewderivers.py
index e47296b50..ba10eeaac 100644
--- a/tests/test_viewderivers.py
+++ b/tests/test_viewderivers.py
@@ -2086,7 +2086,7 @@ class DummySecurityPolicy:
     def identify(self, request):
         return 123
 
-    def permits(self, request, context, identity, permission):
+    def permits(self, request, context, permission):
         return self.permitted
 
 
-- 
cgit v1.2.3