Merge pull request #3545 from luhn/authenticated-userid

Security policy changes

3 files changed, 27 insertions, 14 deletions

diff --git a/tests/test_config/test_routes.py b/tests/test_config/test_routes.py
index 4ff67cf66..423da5834 100644
--- a/tests/test_config/test_routes.py
+++ b/tests/test_config/test_routes.py
@@ -1,4 +1,5 @@
 import unittest
+import warnings
 
 from . import dummyfactory
 from . import DummyContext
@@ -308,6 +309,16 @@ class RoutesConfiguratorMixinTests(unittest.TestCase):
         else:  # pragma: no cover
             raise AssertionError
 
+    def test_add_route_effective_principals_deprecated(self):
+        config = self._makeOne(autocommit=True)
+
+        with warnings.catch_warnings(record=True) as w:
+            warnings.simplefilter('always', DeprecationWarning)
+            config.add_route('foo', '/bar', effective_principals=['any'])
+            self.assertIn(
+                'removed the concept of principals', str(w[-1].message)
+            )
+
 
 class DummyRequest:
     subpath = ()
diff --git a/tests/test_config/test_testing.py b/tests/test_config/test_testing.py
index 500aedeae..efbe28f66 100644
--- a/tests/test_config/test_testing.py
+++ b/tests/test_config/test_testing.py
@@ -17,12 +17,13 @@ class TestingConfiguratorMixinTests(unittest.TestCase):
         from pyramid.testing import DummySecurityPolicy
 
         config = self._makeOne(autocommit=True)
-        config.testing_securitypolicy('user', permissive=False)
+        config.testing_securitypolicy('userid', 'identity', permissive=False)
         from pyramid.interfaces import ISecurityPolicy
 
         policy = config.registry.getUtility(ISecurityPolicy)
         self.assertTrue(isinstance(policy, DummySecurityPolicy))
-        self.assertEqual(policy.identity, 'user')
+        self.assertEqual(policy.userid, 'userid')
+        self.assertEqual(policy.identity, 'identity')
         self.assertEqual(policy.permissive, False)
 
     def test_testing_securitypolicy_remember_result(self):
diff --git a/tests/test_config/test_views.py b/tests/test_config/test_views.py
index baa87dd6b..d133aedbd 100644
--- a/tests/test_config/test_views.py
+++ b/tests/test_config/test_views.py
@@ -1,5 +1,6 @@
 import os
 import unittest
+import warnings
 from zope.interface import implementer
 
 from pyramid import testing
@@ -2041,14 +2042,9 @@ class TestViewsConfigurationMixin(unittest.TestCase):
         outerself = self
 
         class DummyPolicy(object):
-            def identify(self, r):
-                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
 
@@ -2066,14 +2062,9 @@ class TestViewsConfigurationMixin(unittest.TestCase):
         outerself = self
 
         class DummyPolicy(object):
-            def identify(self, r):
-                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
 
@@ -2935,6 +2926,16 @@ class TestViewsConfigurationMixin(unittest.TestCase):
             weighs_more_than='text/plain;charset=utf8',
         )
 
+    def test_effective_principals_deprecated(self):
+        config = self._makeOne(autocommit=True)
+
+        with warnings.catch_warnings(record=True) as w:
+            warnings.simplefilter('always', DeprecationWarning)
+            config.add_view(lambda: None, effective_principals=['any'])
+            self.assertIn(
+                'removed the concept of principals', str(w[-1].message)
+            )
+
 
 class Test_runtime_exc_view(unittest.TestCase):
     def _makeOne(self, view1, view2):