From 2771d5e8930041b8bcef3ff78e2456bef45554e1 Mon Sep 17 00:00:00 2001 From: Folker Bernitt Date: Tue, 19 Jan 2016 10:00:27 +0100 Subject: Make RootResource read account email from mail service - Issue #576 --- service/test/support/integration/app_test_client.py | 5 ++--- service/test/unit/resources/test_root_resource.py | 8 ++++++-- service/test/unit/test_application.py | 6 ++++-- 3 files changed, 12 insertions(+), 7 deletions(-) (limited to 'service/test') diff --git a/service/test/support/integration/app_test_client.py b/service/test/support/integration/app_test_client.py index 8ff64e39..1cec62c2 100644 --- a/service/test/support/integration/app_test_client.py +++ b/service/test/support/integration/app_test_client.py @@ -85,8 +85,6 @@ class AppTestClient(object): mails = yield self.mail_service.all_mails() self.search_engine.index_mails(mails) - self.resource = RootResource() - self.service_factory = ServicesFactory() services = mock() services.keymanager = self.keymanager @@ -96,7 +94,8 @@ class AppTestClient(object): services.feedback_service = self.feedback_service self.service_factory.add_session('someuserid', services) - self.resource.initialize(self.service_factory, self.mail_service) + self.resource = RootResource(self.service_factory) + self.resource.initialize() def _render(self, request, as_json=True): def get_str(_str): diff --git a/service/test/unit/resources/test_root_resource.py b/service/test/unit/resources/test_root_resource.py index 4cdaf97a..c4ffc068 100644 --- a/service/test/unit/resources/test_root_resource.py +++ b/service/test/unit/resources/test_root_resource.py @@ -1,6 +1,6 @@ import unittest import re -from mockito import mock, when +from mockito import mock, when, any as ANY from test.unit.resources import DummySite from twisted.web.test.requesthelper import DummyRequest from pixelated.resources.root_resource import RootResource @@ -10,13 +10,17 @@ class TestRootResource(unittest.TestCase): MAIL_ADDRESS = 'test_user@pixelated-project.org' def setUp(self): - root_resource = RootResource() + self.services_factory_mock = mock() + self.mail_service_mock = mock() + root_resource = RootResource(self.services_factory_mock) root_resource._mode = root_resource root_resource.account_email = self.MAIL_ADDRESS root_resource._html_template = "$account_email" self.web = DummySite(root_resource) def test_render_GET_should_template_account_email(self): + when(self.services_factory_mock).mail_service(ANY()).thenReturn(self.mail_service_mock) + self.mail_service_mock.account_email = self.MAIL_ADDRESS request = DummyRequest(['']) d = self.web.get(request) diff --git a/service/test/unit/test_application.py b/service/test/unit/test_application.py index 2f9ee742..7f46d9e9 100644 --- a/service/test/unit/test_application.py +++ b/service/test/unit/test_application.py @@ -42,10 +42,11 @@ class ApplicationTest(unittest.TestCase): def test_that_start_user_agent_binds_to_tcp_port_if_no_ssl_options(self, services_mock, reactor_mock, _): # FIXME patch something closer, instead of leap.common app_mock = MagicMock() + services_factory_mock = MagicMock() leap_session = MagicMock() config = ApplicationTest.MockConfig(12345, '127.0.0.1', leap_session) - d = pixelated.application.start_user_agent(app_mock, config.home, leap_session) + d = pixelated.application.start_user_agent(app_mock, services_factory_mock, config.home, leap_session) def _assert(_): services_mock.assert_called_once_with(config.home, leap_session) @@ -59,12 +60,13 @@ class ApplicationTest(unittest.TestCase): def test_that_start_user_agent_binds_to_ssl_if_ssl_options(self, services_mock, reactor_mock, _): # FIXME patch something closer, instead of leap.common app_mock = MagicMock() + services_factory_mock = MagicMock() leap_session = MagicMock() pixelated.application._ssl_options = lambda x, y: 'options' config = ApplicationTest.MockConfig(12345, '127.0.0.1', sslkey="sslkey", sslcert="sslcert") - d = pixelated.application.start_user_agent(app_mock, config.home, leap_session) + d = pixelated.application.start_user_agent(app_mock, services_factory_mock, config.home, leap_session) def _assert(_): services_mock.assert_called_once_with(config.home, leap_session) -- cgit v1.2.3