diff options
| author | Folker Bernitt <fbernitt@thoughtworks.com> | 2016-01-19 10:00:27 +0100 |
|---|---|---|
| committer | Folker Bernitt <fbernitt@thoughtworks.com> | 2016-01-19 10:00:27 +0100 |
| commit | 2771d5e8930041b8bcef3ff78e2456bef45554e1 (patch) | |
| tree | 41c0bc48fd7732cad3fbe34349af7a5ad1ba95d5 /service/test/unit | |
| parent | c96ee7ab8e6a365e8f2a848f35a3f0af8bb9389b (diff) | |
Make RootResource read account email from mail service
- Issue #576
Diffstat (limited to 'service/test/unit')
| -rw-r--r-- | service/test/unit/resources/test_root_resource.py | 8 | ||||
| -rw-r--r-- | service/test/unit/test_application.py | 6 |
2 files changed, 10 insertions, 4 deletions
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 = "<html><head><title>$account_email</title></head></html>" 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) |