From 7ec9e7cb2f8aea52cd8645c98d336994357a66f5 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Sat, 30 May 2009 20:42:58 +0000 Subject: - Remove "context" argument from ``effective_principals`` and ``authenticated_userid`` function APIs in ``repoze.bfg.security``, effectively a doing reversion to 0.8 and before behavior. Both functions now again accept only the ``request`` parameter. --- repoze/bfg/tests/test_security.py | 39 ++++++++++++++++----------------------- 1 file changed, 16 insertions(+), 23 deletions(-) (limited to 'repoze/bfg/tests/test_security.py') diff --git a/repoze/bfg/tests/test_security.py b/repoze/bfg/tests/test_security.py index 3f18d3a4a..bb1a54e04 100644 --- a/repoze/bfg/tests/test_security.py +++ b/repoze/bfg/tests/test_security.py @@ -230,21 +230,19 @@ class TestAuthenticatedUserId(unittest.TestCase): def tearDown(self): cleanUp() - def _callFUT(self, *arg): + def _callFUT(self, request): from repoze.bfg.security import authenticated_userid - return authenticated_userid(*arg) + return authenticated_userid(request) def test_no_authentication_policy(self): - context = DummyContext() request = DummyRequest({}) - result = self._callFUT(context, request) + result = self._callFUT(request) self.assertEqual(result, None) def test_with_authentication_policy(self): _registerAuthenticationPolicy('yo') - context = DummyContext() request = DummyRequest({}) - result = self._callFUT(context, request) + result = self._callFUT(request) self.assertEqual(result, 'yo') class TestEffectivePrincipals(unittest.TestCase): @@ -254,21 +252,19 @@ class TestEffectivePrincipals(unittest.TestCase): def tearDown(self): cleanUp() - def _callFUT(self, *arg): + def _callFUT(self, request): from repoze.bfg.security import effective_principals - return effective_principals(*arg) + return effective_principals(request) def test_no_authentication_policy(self): - context = DummyContext() request = DummyRequest({}) - result = self._callFUT(context, request) + result = self._callFUT(request) self.assertEqual(result, []) def test_with_authentication_policy(self): _registerAuthenticationPolicy('yo') - context = DummyContext() request = DummyRequest({}) - result = self._callFUT(context, request) + result = self._callFUT(request) self.assertEqual(result, 'yo') class TestPrincipalsAllowedByPermission(unittest.TestCase): @@ -308,14 +304,13 @@ class TestRemember(unittest.TestCase): def test_no_authentication_policy(self): context = DummyContext() request = DummyRequest({}) - result = self._callFUT(context, request, 'me') + result = self._callFUT(request, 'me') self.assertEqual(result, []) def test_with_authentication_policy(self): _registerAuthenticationPolicy('yo') - context = DummyContext() request = DummyRequest({}) - result = self._callFUT(context, request, 'me') + result = self._callFUT(request, 'me') self.assertEqual(result, 'yo') class TestForget(unittest.TestCase): @@ -330,16 +325,14 @@ class TestForget(unittest.TestCase): return forget(*arg) def test_no_authentication_policy(self): - context = DummyContext() request = DummyRequest({}) - result = self._callFUT(context, request) + result = self._callFUT(request) self.assertEqual(result, []) def test_with_authentication_policy(self): _registerAuthenticationPolicy('yo') - context = DummyContext() request = DummyRequest({}) - result = self._callFUT(context, request) + result = self._callFUT(request) self.assertEqual(result, 'yo') class DummyContext: @@ -354,16 +347,16 @@ class DummyAuthenticationPolicy: def __init__(self, result): self.result = result - def effective_principals(self, context, request): + def effective_principals(self, request): return self.result - def authenticated_userid(self, context, request): + def authenticated_userid(self, request): return self.result - def remember(self, context, request, principal, **kw): + def remember(self, request, principal, **kw): return self.result - def forget(self, context, request): + def forget(self, request): return self.result class DummyAuthorizationPolicy: -- cgit v1.2.3