Merge pull request #3620 from luhn/identity-rename

Rename `ISecurityPolicy.authenticated_identity` to `identity`

4 files changed, 9 insertions, 9 deletions

diff --git a/tests/pkgs/securityapp/__init__.py b/tests/pkgs/securityapp/__init__.py
index facc37878..c5b713f23 100644
--- a/tests/pkgs/securityapp/__init__.py
+++ b/tests/pkgs/securityapp/__init__.py
@@ -3,7 +3,7 @@ from pyramid.security import Allowed, Denied
 
 
 class SecurityPolicy:
-    def authenticated_identity(self, request):
+    def identity(self, request):
         raise NotImplementedError()  # pragma: no cover
 
     def authenticated_userid(self, request):
diff --git a/tests/test_config/test_testing.py b/tests/test_config/test_testing.py
index 5cdd19b50..120cfe5da 100644
--- a/tests/test_config/test_testing.py
+++ b/tests/test_config/test_testing.py
@@ -24,7 +24,7 @@ class TestingConfiguratorMixinTests(unittest.TestCase):
         policy = config.registry.getUtility(ISecurityPolicy)
         self.assertTrue(isinstance(policy, DummySecurityPolicy))
         self.assertEqual(policy.userid, 'userid')
-        self.assertEqual(policy.identity, 'identity')
+        self.assertEqual(policy._identity, 'identity')
         self.assertEqual(policy.permissive, False)
 
     def test_testing_securitypolicy_remember_result(self):
diff --git a/tests/test_security.py b/tests/test_security.py
index efaf9b4bf..9577f7e70 100644
--- a/tests/test_security.py
+++ b/tests/test_security.py
@@ -317,7 +317,7 @@ class TestViewExecutionPermitted(unittest.TestCase):
         self.assertTrue(result)
 
 
-class TestAuthenticatedIdentity(unittest.TestCase):
+class TestIdentity(unittest.TestCase):
     def setUp(self):
         testing.setUp()
 
@@ -326,12 +326,12 @@ class TestAuthenticatedIdentity(unittest.TestCase):
 
     def test_identity_no_security_policy(self):
         request = _makeRequest()
-        self.assertEqual(request.authenticated_identity, None)
+        self.assertEqual(request.identity, None)
 
     def test_identity(self):
         request = _makeRequest()
         _registerSecurityPolicy(request.registry, 'yo')
-        self.assertEqual(request.authenticated_identity, 'yo')
+        self.assertEqual(request.identity, 'yo')
 
 
 class TestAuthenticatedUserId(unittest.TestCase):
@@ -501,7 +501,7 @@ class TestLegacySecurityPolicy(unittest.TestCase):
         policy = LegacySecurityPolicy()
         _registerAuthenticationPolicy(request.registry, 'userid')
 
-        self.assertEqual(policy.authenticated_identity(request), 'userid')
+        self.assertEqual(policy.identity(request), 'userid')
 
     def test_remember(self):
         from pyramid.security import LegacySecurityPolicy
@@ -554,7 +554,7 @@ class DummySecurityPolicy:
     def __init__(self, result):
         self.result = result
 
-    def authenticated_identity(self, request):
+    def identity(self, request):
         return self.result
 
     def authenticated_userid(self, request):
diff --git a/tests/test_testing.py b/tests/test_testing.py
index 8f912dbd7..3eb4b040b 100644
--- a/tests/test_testing.py
+++ b/tests/test_testing.py
@@ -27,9 +27,9 @@ class TestDummySecurityPolicy(unittest.TestCase):
         klass = self._getTargetClass()
         return klass(userid, identity, permissive)
 
-    def test_authenticated_identity(self):
+    def test_identity(self):
         policy = self._makeOne('user', 'identity')
-        self.assertEqual(policy.authenticated_identity(None), 'identity')
+        self.assertEqual(policy.identity(None), 'identity')
 
     def test_authenticated_userid(self):
         policy = self._makeOne('user')