From bb823fda470a0c5e75e8d39da1cb269eaa8fc568 Mon Sep 17 00:00:00 2001 From: NavaL Date: Tue, 26 Jan 2016 10:12:23 +0100 Subject: minor refactorings Issue #576 --- service/test/support/integration/multi_user_client.py | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) (limited to 'service/test') diff --git a/service/test/support/integration/multi_user_client.py b/service/test/support/integration/multi_user_client.py index c610c3e8..897799aa 100644 --- a/service/test/support/integration/multi_user_client.py +++ b/service/test/support/integration/multi_user_client.py @@ -27,7 +27,7 @@ from leap.auth import SRPAuth from pixelated.adapter.mailstore.leap_attachment_store import LeapAttachmentStore from pixelated.adapter.services.feedback_service import FeedbackService -from pixelated.application import UserAgentMode, ServicesFactory +from pixelated.application import UserAgentMode, ServicesFactory, set_up_protected_resources from pixelated.adapter.mailstore import LeapMailStore from pixelated.adapter.mailstore.searchable_mailstore import SearchableMailStore @@ -58,20 +58,8 @@ class MultiUserClient(AppTestClient): self.service_factory = ServicesFactory(UserAgentMode(is_single_user=False)) root_resource = RootResource(self.service_factory) - anonymous_resource = LoginResource(self.service_factory) - leap_provider = mock() - checker = LeapPasswordChecker(leap_provider) - session_checker = SessionChecker() - - realm = PixelatedRealm(root_resource, anonymous_resource) - _portal = portal.Portal(realm, [checker, session_checker, AllowAnonymousAccess()]) - - protected_resource = PixelatedAuthSessionWrapper(_portal, root_resource, anonymous_resource, []) - anonymous_resource.set_portal(_portal) - root_resource.initialize(_portal) - - self.resource = protected_resource + self.resource = set_up_protected_resources(root_resource, leap_provider, self.service_factory) @defer.inlineCallbacks def login(self, username='username', password='password'): -- cgit v1.2.3