diff options
Diffstat (limited to 'service/test/unit')
5 files changed, 128 insertions, 7 deletions
diff --git a/service/test/unit/adapter/test_mailbox_indexer_listener.py b/service/test/unit/adapter/test_mailbox_indexer_listener.py index c88ba035..c101aa1a 100644 --- a/service/test/unit/adapter/test_mailbox_indexer_listener.py +++ b/service/test/unit/adapter/test_mailbox_indexer_listener.py @@ -31,7 +31,7 @@ class MailboxListenerTest(unittest.TestCase): def test_add_itself_to_mailbox_listeners(self): self.account.mailboxes = ['INBOX'] mailbox = mock() - when(self.account).getMailbox('INBOX').thenReturn(mailbox) + when(self.account).get_collection_by_mailbox('INBOX').thenReturn(mailbox) mailbox.listeners = set() when(mailbox).addListener = lambda x: mailbox.listeners.add(x) @@ -49,7 +49,7 @@ class MailboxListenerTest(unittest.TestCase): listener = MailboxIndexerListener('INBOX', self.mail_store, search_engine) when(self.mail_store).get_mailbox_mail_ids('INBOX').thenReturn({'ident1', 'ident2', 'missing_ident'}) when(self.mail_store).get_mails({'missing_ident'}, include_body=True).thenReturn([mail]) - listener.newMessages(10, 5) + listener.notify_new() verify(self.mail_store, times=1).get_mails({'missing_ident'}, include_body=True) verify(search_engine).index_mails([mail]) @@ -59,6 +59,6 @@ class MailboxListenerTest(unittest.TestCase): when(logger).error(ANY()).thenReturn(None) listener = MailboxIndexerListener('INBOX', self.mail_store, mock()) - yield listener.newMessages(1, 1) + yield listener.notify_new() verify(logger).error(ANY()) diff --git a/service/test/unit/bitmask_libraries/test_session.py b/service/test/unit/bitmask_libraries/test_session.py index aad2cac2..84f9f023 100644 --- a/service/test/unit/bitmask_libraries/test_session.py +++ b/service/test/unit/bitmask_libraries/test_session.py @@ -29,7 +29,7 @@ class SessionTest(AbstractLeapTest): self.smtp_mock = MagicMock() @patch('pixelated.bitmask_libraries.session.register') - @patch('pixelated.bitmask_libraries.session.IMAPAccount') + @patch('pixelated.bitmask_libraries.session.Account') @defer.inlineCallbacks def test_background_jobs_are_started_during_initial_sync(self, *unused): mailFetcherMock = MagicMock() @@ -41,7 +41,7 @@ class SessionTest(AbstractLeapTest): @patch('pixelated.bitmask_libraries.session.register') @patch('pixelated.bitmask_libraries.session.unregister') - @patch('pixelated.bitmask_libraries.session.IMAPAccount') + @patch('pixelated.bitmask_libraries.session.Account') @defer.inlineCallbacks def test_that_close_stops_background_jobs(self, *unused): with patch('pixelated.bitmask_libraries.session.reactor.callFromThread', new=_execute_func) as _: @@ -153,7 +153,7 @@ class SessionTest(AbstractLeapTest): @patch('pixelated.bitmask_libraries.session.register') @patch('pixelated.bitmask_libraries.session.unregister') - @patch('pixelated.bitmask_libraries.session.IMAPAccount') + @patch('pixelated.bitmask_libraries.session.Account') @defer.inlineCallbacks def test_session_initial_sync_only_triggered_once(self, *unused): mailFetcherMock = MagicMock() diff --git a/service/test/unit/resources/test_logout_resources.py b/service/test/unit/resources/test_logout_resources.py index 312d2ba4..49866057 100644 --- a/service/test/unit/resources/test_logout_resources.py +++ b/service/test/unit/resources/test_logout_resources.py @@ -1,12 +1,16 @@ +import logging + from mock import patch, MagicMock -from twisted.trial import unittest from twisted.internet import defer +from twisted.trial import unittest from twisted.web.error import UnsupportedMethod from twisted.web.test.requesthelper import DummyRequest from pixelated.resources.logout_resource import LogoutResource from test.unit.resources import DummySite +logging.getLogger('pixelated.resources').addHandler(logging.NullHandler()) + class TestLogoutResource(unittest.TestCase): def setUp(self): @@ -40,3 +44,20 @@ class TestLogoutResource(unittest.TestCase): request.method = 'GET' self.assertRaises(UnsupportedMethod, self.web.get, request) + + def test_errback_is_called(self): + request = DummyRequest(['/logout']) + request.method = 'POST' + + session = self.resource.get_session(request) + exception = Exception('') + session.expire = MagicMock(side_effect=exception) + + d = self.web.get(request) + + def assert_500_when_exception_is_thrown(_): + self.assertEqual(500, request.responseCode) + self.assertEqual('Something went wrong!', request.written[0]) + + d.addCallback(assert_500_when_exception_is_thrown) + return d diff --git a/service/test/unit/resources/test_tags_resource.py b/service/test/unit/resources/test_tags_resource.py new file mode 100644 index 00000000..684e95f2 --- /dev/null +++ b/service/test/unit/resources/test_tags_resource.py @@ -0,0 +1,36 @@ +import logging + +from mock import MagicMock +from twisted.trial import unittest +from twisted.web.test.requesthelper import DummyRequest +from pixelated.resources.tags_resource import TagsResource +from test.unit.resources import DummySite + +logging.getLogger('pixelated.resources').addHandler(logging.NullHandler()) + + +class TestTagsResource(unittest.TestCase): + def setUp(self): + self.services_factory = MagicMock() + self.resource = TagsResource(self.services_factory) + + def test_errback_is_called(self): + exception = Exception('') + mock_search_engine = MagicMock() + mock_search_engine.tags = MagicMock(side_effect=exception) + mock_service = MagicMock() + mock_service.search_engine = mock_search_engine + self.services_factory.services.return_value = mock_service + self.web = DummySite(self.resource) + + request = DummyRequest(['/tags']) + request.method = 'GET' + + d = self.web.get(request) + + def assert_500_when_exception_is_thrown(_): + self.assertEqual(500, request.responseCode) + self.assertEqual('Something went wrong!', request.written[0]) + + d.addCallback(assert_500_when_exception_is_thrown) + return d diff --git a/service/test/unit/resources/test_user_settings_resource.py b/service/test/unit/resources/test_user_settings_resource.py new file mode 100644 index 00000000..d69f4895 --- /dev/null +++ b/service/test/unit/resources/test_user_settings_resource.py @@ -0,0 +1,64 @@ +import unittest +import json +import ast + +from pixelated.application import UserAgentMode +from pixelated.resources.user_settings_resource import UserSettingsResource, FINGERPRINT_NOT_FOUND +from mockito import mock, when, any +from test.unit.resources import DummySite +from twisted.web.test.requesthelper import DummyRequest +from leap.keymanager import OpenPGPKey +from twisted.internet import defer +from twisted.python.failure import Failure + +MAIL_ADDRESS = 'some@key' +FINGERPRINT = '4-8-12-13-23-42' + + +class TestUserSettingsResource(unittest.TestCase): + + def setUp(self): + self.services = mock() + self.mail_service = mock() + self.mail_service.account_email = MAIL_ADDRESS + self.keymanager = mock() + self.services_factory = mock() + self.services_factory.mode = UserAgentMode(is_single_user=True) + self.services.mail_service = self.mail_service + self.services.keymanager = self.keymanager + self.services_factory._services_by_user = {'someuserid': self.keymanager} + self.resource = UserSettingsResource(self.services_factory) + when(self.services_factory).services(any()).thenReturn(self.services) + self.web = DummySite(self.resource) + + def test_fingerprint_given(self): + key = OpenPGPKey(MAIL_ADDRESS) + key.fingerprint = FINGERPRINT + request = DummyRequest(['/user-settings']) + when(self.keymanager).fetch_key(MAIL_ADDRESS).thenReturn(defer.succeed(key)) + + d = self.web.get(request) + + def assert_response(_): + response = json.loads(request.written[0]) + self.assertEqual(FINGERPRINT, response['fingerprint']) + self.assertEqual(MAIL_ADDRESS, response['account_email']) + + d.addCallback(assert_response) + return d + + def test_fingerprint_missing(self): + key = OpenPGPKey(MAIL_ADDRESS) + key.fingerprint = FINGERPRINT + request = DummyRequest(['/user-settings']) + when(self.keymanager).fetch_key(MAIL_ADDRESS).thenReturn(defer.fail(Failure)) + + d = self.web.get(request) + + def assert_response(_): + response = json.loads(request.written[0]) + self.assertEqual(FINGERPRINT_NOT_FOUND, response['fingerprint']) + self.assertEqual(MAIL_ADDRESS, response['account_email']) + + d.addCallback(assert_response) + return d |