diff options
Diffstat (limited to 'service/test')
-rw-r--r-- | service/test/functional/features/environment.py | 4 | ||||
-rw-r--r-- | service/test/support/integration/app_test_client.py | 4 | ||||
-rw-r--r-- | service/test/unit/adapter/test_mail_service.py | 11 | ||||
-rw-r--r-- | service/test/unit/adapter/test_mailbox.py | 3 |
4 files changed, 13 insertions, 9 deletions
diff --git a/service/test/functional/features/environment.py b/service/test/functional/features/environment.py index 5e93c840..d78083d0 100644 --- a/service/test/functional/features/environment.py +++ b/service/test/functional/features/environment.py @@ -38,8 +38,8 @@ def after_all(context): def before_feature(context, feature): - # context.browser = webdriver.Firefox() - context.browser = webdriver.PhantomJS() + context.browser = webdriver.Firefox() + # context.browser = webdriver.PhantomJS() context.browser.set_window_size(1280, 1024) context.browser.implicitly_wait(5) context.browser.set_page_load_timeout(60) # wait for data diff --git a/service/test/support/integration/app_test_client.py b/service/test/support/integration/app_test_client.py index 45f81cc1..dd2d0200 100644 --- a/service/test/support/integration/app_test_client.py +++ b/service/test/support/integration/app_test_client.py @@ -63,11 +63,11 @@ class AppTestClient: self.soledad_querier.get_index_masterkey = lambda: self.INDEX_KEY self.account = SoledadBackedAccount('test', self.soledad, MagicMock()) - self.mailboxes = Mailboxes(self.account, self.soledad_querier) + self.search_engine = SearchEngine(self.soledad_querier, agent_home=soledad_test_folder) + self.mailboxes = Mailboxes(self.account, self.soledad_querier, self.search_engine) self.mail_sender = Mock() self.tag_service = TagService() self.draft_service = DraftService(self.mailboxes) - self.search_engine = SearchEngine(self.soledad_querier, agent_home=soledad_test_folder) self.mail_service = MailService(self.mailboxes, self.mail_sender, self.tag_service, self.soledad_querier, self.search_engine) self.search_engine.index_mails(self.mail_service.all_mails()) diff --git a/service/test/unit/adapter/test_mail_service.py b/service/test/unit/adapter/test_mail_service.py index 32b45dc4..4b1c60d6 100644 --- a/service/test/unit/adapter/test_mail_service.py +++ b/service/test/unit/adapter/test_mail_service.py @@ -14,8 +14,10 @@ # You should have received a copy of the GNU Affero General Public License # along with Pixelated. If not, see <http://www.gnu.org/licenses/>. import unittest +from pixelated.adapter.model.mail import InputMail from pixelated.adapter.services.mail_service import MailService +from test.support.test_helper import mail_dict from mockito import * @@ -29,14 +31,15 @@ class TestMailService(unittest.TestCase): self.mailboxes.sent = lambda: mock() self.mail_sender = mock() - self.mail_service = MailService(self.mailboxes, self.mail_sender, self.tag_service, self.querier) + self.search_engine = mock() + self.mail_service = MailService(self.mailboxes, self.mail_sender, self.tag_service, self.querier, self.search_engine) def test_send_mail(self): - mail = "mail" + when(InputMail).from_dict(any()).thenReturn('inputmail') - self.mail_service.send(mail) + self.mail_service.send_mail(mail_dict()) - verify(self.mail_sender).sendmail(mail) + verify(self.mail_sender).sendmail("inputmail") def test_mark_as_read(self): mail = mock() diff --git a/service/test/unit/adapter/test_mailbox.py b/service/test/unit/adapter/test_mailbox.py index 9725f418..b44f507b 100644 --- a/service/test/unit/adapter/test_mailbox.py +++ b/service/test/unit/adapter/test_mailbox.py @@ -25,7 +25,8 @@ class PixelatedMailboxTest(unittest.TestCase): def setUp(self): self.tag_service = mock() self.querier = mock() - self.mailbox = Mailbox('INBOX', self.querier) + self.search_engine = mock() + self.mailbox = Mailbox('INBOX', self.querier, self.search_engine) def test_remove_message_from_mailbox(self): mail = PixelatedMail.from_soledad(*test_helper.leap_mail(), soledad_querier=self.querier) |