diff options
| author | Roald de Vries <rdevries@thoughtworks.com> | 2016-12-05 10:56:24 +0100 |
|---|---|---|
| committer | Roald de Vries <rdevries@thoughtworks.com> | 2016-12-05 10:56:24 +0100 |
| commit | ae871e84f6de213f01299f2754fb2e68d4a3afe2 (patch) | |
| tree | 75ea49f16d9e9d2bc1e2a7691d4ce9bb49e967a0 /service/test/support | |
| parent | ed69fa3b7bf0b543b6c5d3f41504965a1b085808 (diff) | |
remove templates folder from root resource parameters
Diffstat (limited to 'service/test/support')
| -rw-r--r-- | service/test/support/integration/app_test_client.py | 4 | ||||
| -rw-r--r-- | service/test/support/integration/multi_user_client.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/service/test/support/integration/app_test_client.py b/service/test/support/integration/app_test_client.py index c611fbd0..1421b96b 100644 --- a/service/test/support/integration/app_test_client.py +++ b/service/test/support/integration/app_test_client.py @@ -38,7 +38,7 @@ from leap.soledad.client import Soledad from leap.bitmask.mail.adaptors.soledad import SoledadMailAdaptor from pixelated.adapter.mailstore.leap_attachment_store import LeapAttachmentStore from pixelated.adapter.services.feedback_service import FeedbackService -from pixelated.application import UserAgentMode, set_up_protected_resources, get_static_folder, get_templates_folder +from pixelated.application import UserAgentMode, set_up_protected_resources, get_static_folder from pixelated.config.sessions import LeapSession from pixelated.config.services import Services, ServicesFactory, SingleUserServicesFactory from pixelated.config.site import PixelatedSite @@ -218,7 +218,7 @@ class AppTestClient(object): services = self._test_account.services self.service_factory.add_session('someuserid', services) - self.resource = RootResource(self.service_factory, get_templates_folder(), get_static_folder()) + self.resource = RootResource(self.service_factory, get_static_folder()) provider = mock() self.resource.initialize(provider) else: diff --git a/service/test/support/integration/multi_user_client.py b/service/test/support/integration/multi_user_client.py index d7ab77a0..de272e16 100644 --- a/service/test/support/integration/multi_user_client.py +++ b/service/test/support/integration/multi_user_client.py @@ -19,7 +19,7 @@ from mockito import mock, when, any as ANY from pixelated.authentication import Authenticator, Authentication from twisted.internet import defer -from pixelated.application import UserAgentMode, set_up_protected_resources, get_static_folder, get_templates_folder +from pixelated.application import UserAgentMode, set_up_protected_resources, get_static_folder from pixelated.config.services import ServicesFactory from pixelated.config.sessions import LeapSessionFactory @@ -46,7 +46,7 @@ class MultiUserClient(AppTestClient): self.service_factory = ServicesFactory(UserAgentMode(is_single_user=False)) - root_resource = RootResource(self.service_factory, get_templates_folder(), get_static_folder()) + root_resource = RootResource(self.service_factory, get_static_folder()) leap_provider = mock() self.credentials_checker = StubSRPChecker(leap_provider) self.resource = set_up_protected_resources(root_resource, leap_provider, self.service_factory) |