summaryrefslogtreecommitdiff
path: root/service/test/unit/resources
diff options
context:
space:
mode:
authorRoald de Vries <rdevries@thoughtworks.com>2016-12-05 10:56:24 +0100
committerRoald de Vries <rdevries@thoughtworks.com>2016-12-05 10:56:24 +0100
commitae871e84f6de213f01299f2754fb2e68d4a3afe2 (patch)
tree75ea49f16d9e9d2bc1e2a7691d4ce9bb49e967a0 /service/test/unit/resources
parented69fa3b7bf0b543b6c5d3f41504965a1b085808 (diff)
remove templates folder from root resource parameters
Diffstat (limited to 'service/test/unit/resources')
-rw-r--r--service/test/unit/resources/test_auth.py6
-rw-r--r--service/test/unit/resources/test_root_resource.py6
2 files changed, 6 insertions, 6 deletions
diff --git a/service/test/unit/resources/test_auth.py b/service/test/unit/resources/test_auth.py
index 7112ed96..b43ab15e 100644
--- a/service/test/unit/resources/test_auth.py
+++ b/service/test/unit/resources/test_auth.py
@@ -1,6 +1,6 @@
from mockito import mock, when, any as ANY
-from pixelated.application import get_templates_folder, get_static_folder
+from pixelated.application import get_static_folder
from pixelated.resources.auth import SessionChecker, PixelatedRealm, PixelatedAuthSessionWrapper
from pixelated.resources.login_resource import LoginResource
from pixelated.resources.root_resource import RootResource
@@ -42,8 +42,8 @@ class TestPixelatedAuthSessionWrapper(unittest.TestCase):
session_checker = SessionChecker(services_factory)
self.portal = Portal(self.realm_mock, [session_checker, AllowAnonymousAccess()])
self.user_uuid_mock = mock()
- self.root_resource = RootResource(services_factory, get_templates_folder(), get_static_folder())
- self.anonymous_resource = RootResource(services_factory, get_templates_folder(), get_static_folder(), public=True)
+ self.root_resource = RootResource(services_factory, get_static_folder())
+ self.anonymous_resource = RootResource(services_factory, get_static_folder(), public=True)
self.session_wrapper = PixelatedAuthSessionWrapper(self.portal, self.root_resource, self.anonymous_resource)
self.request = DummyRequest([])
diff --git a/service/test/unit/resources/test_root_resource.py b/service/test/unit/resources/test_root_resource.py
index d42a4b38..4c9af052 100644
--- a/service/test/unit/resources/test_root_resource.py
+++ b/service/test/unit/resources/test_root_resource.py
@@ -5,7 +5,7 @@ from mock import MagicMock, patch
from mockito import mock, when, any as ANY
import pixelated
-from pixelated.application import UserAgentMode, get_templates_folder, get_static_folder
+from pixelated.application import UserAgentMode, get_static_folder
from pixelated.resources import IPixelatedSession, UnAuthorizedResource
from pixelated.resources.features_resource import FeaturesResource
from pixelated.resources.login_resource import LoginResource
@@ -22,7 +22,7 @@ from pixelated.resources.root_resource import InboxResource, RootResource, MODE_
class TestPublicRootResource(unittest.TestCase):
def setUp(self):
- self.public_root_resource = RootResource(mock(), get_templates_folder(), get_static_folder(), public=True)
+ self.public_root_resource = RootResource(mock(), get_static_folder(), public=True)
self.web = DummySite(self.public_root_resource)
@patch('pixelated.resources.mails_resource.events.register')
@@ -105,7 +105,7 @@ class TestRootResource(unittest.TestCase):
when(self.services_factory).services(ANY()).thenReturn(self.services)
self.mail_service.account_email = self.MAIL_ADDRESS
- self.root_resource = RootResource(self.services_factory, get_templates_folder(), get_static_folder())
+ self.root_resource = RootResource(self.services_factory, get_static_folder())
self.web = DummySite(self.root_resource)
@patch('pixelated.resources.mails_resource.events.register')