From 638125171a311b9a6ba7c02da844ca601a2b0e0e Mon Sep 17 00:00:00 2001 From: Theron Luhn Date: Sat, 14 Dec 2019 19:16:58 -0600 Subject: Fix tests for `DummySecurityPolicy`. --- tests/test_config/test_testing.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'tests/test_config') 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): -- cgit v1.2.3 From 6213507e80d1b77ffd314b88c23ff7eca99aaee4 Mon Sep 17 00:00:00 2001 From: Theron Luhn Date: Sat, 14 Dec 2019 19:24:40 -0600 Subject: Fix couple final view tests. --- tests/test_config/test_views.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'tests/test_config') 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 -- cgit v1.2.3 From 2e06fa414412688dc3b7e0b422b0fc0b96ec882f Mon Sep 17 00:00:00 2001 From: Theron Luhn Date: Sat, 14 Dec 2019 20:17:36 -0800 Subject: Bring back identity into permits. --- tests/test_config/test_views.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'tests/test_config') 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 -- cgit v1.2.3 From 32bf9b3669f2ba0c4a0aaf35f4e2cdad8f9314f0 Mon Sep 17 00:00:00 2001 From: Theron Luhn Date: Sun, 15 Dec 2019 19:55:10 -0800 Subject: Revert "Bring back identity into permits." This reverts commit 2e06fa414412688dc3b7e0b422b0fc0b96ec882f. --- tests/test_config/test_views.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'tests/test_config') 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 -- cgit v1.2.3 From 1b127af1412ce9ae24cc993c15162b48283d76e9 Mon Sep 17 00:00:00 2001 From: Theron Luhn Date: Sun, 15 Dec 2019 20:42:49 -0800 Subject: Fix coverage. --- tests/test_config/test_views.py | 8 -------- 1 file changed, 8 deletions(-) (limited to 'tests/test_config') diff --git a/tests/test_config/test_views.py b/tests/test_config/test_views.py index a474d3754..d6b08c2f7 100644 --- a/tests/test_config/test_views.py +++ b/tests/test_config/test_views.py @@ -2041,10 +2041,6 @@ class TestViewsConfigurationMixin(unittest.TestCase): outerself = self class DummyPolicy(object): - def identify(self, r): - outerself.assertEqual(r, request) - return 123 - def permits(self, r, context, permission): outerself.assertEqual(r, request) outerself.assertEqual(context, None) @@ -2065,10 +2061,6 @@ class TestViewsConfigurationMixin(unittest.TestCase): outerself = self class DummyPolicy(object): - def identify(self, r): - outerself.assertEqual(r, request) - return 123 - def permits(self, r, context, permission): outerself.assertEqual(r, request) outerself.assertEqual(context, None) -- cgit v1.2.3 From 570243fcf3f9bb7b3da78404b0598011791ac882 Mon Sep 17 00:00:00 2001 From: Michael Merickel Date: Mon, 23 Dec 2019 13:57:14 -0600 Subject: add coverage tests for deprecation warnings --- tests/test_config/test_routes.py | 11 +++++++++++ tests/test_config/test_views.py | 11 +++++++++++ 2 files changed, 22 insertions(+) (limited to 'tests/test_config') 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_views.py b/tests/test_config/test_views.py index d6b08c2f7..dcea02b1d 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 @@ -2925,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): -- cgit v1.2.3