4 files changed, 5 insertions, 36 deletions
diff --git a/service/test/unit/adapter/test_draft_service.py b/service/test/unit/adapter/test_draft_service.py
index 0dd6cd2a..79eca5f6 100644
--- a/service/test/unit/adapter/test_draft_service.py
+++ b/service/test/unit/adapter/test_draft_service.py
@@ -12,7 +12,7 @@ class DraftServiceTest(unittest.TestCase):
         self.mailboxes = mock()
         self.drafts_mailbox = mock()
         self.draft_service = DraftService(self.mailboxes)
-        when(self.mailboxes).drafts().thenReturn(self.drafts_mailbox)
+        self.mailboxes.drafts = self.drafts_mailbox
 
     def test_add_draft(self):
         mail = InputMail()
diff --git a/service/test/unit/adapter/test_mail_service.py b/service/test/unit/adapter/test_mail_service.py
index f4b89f57..f5e29b0c 100644
--- a/service/test/unit/adapter/test_mail_service.py
+++ b/service/test/unit/adapter/test_mail_service.py
@@ -27,9 +27,9 @@ class TestMailService(unittest.TestCase):
         self.drafts = mock()
         self.querier = mock()
         self.mailboxes = mock()
-        self.mailboxes.drafts = lambda: self.drafts
-        self.mailboxes.trash = lambda: mock()
-        self.mailboxes.sent = lambda: mock()
+        self.mailboxes.drafts = self.drafts
+        self.mailboxes.trash = mock()
+        self.mailboxes.sent = mock()
 
         self.mail_sender = mock()
         self.search_engine = mock()
diff --git a/service/test/unit/adapter/test_mailboxes.py b/service/test/unit/adapter/test_mailboxes.py
index 5b4548eb..6ff3849b 100644
--- a/service/test/unit/adapter/test_mailboxes.py
+++ b/service/test/unit/adapter/test_mailboxes.py
@@ -23,6 +23,7 @@ from mock import MagicMock
 
 
 class PixelatedMailboxesTest(unittest.TestCase):
+
     def setUp(self):
         self.querier = mock()
         self.search_engine = mock()
diff --git a/service/test/unit/config/test_welcome_mail.py b/service/test/unit/config/test_welcome_mail.py
deleted file mode 100644
index 3971c73f..00000000
--- a/service/test/unit/config/test_welcome_mail.py
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# Copyright (c) 2014 ThoughtWorks, Inc.
-#
-# Pixelated is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Pixelated is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# 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.config.welcome_mail import build_welcome_mail
-from pixelated.adapter.model.mail import InputMail
-
-
-class WelcomeMailTest(unittest.TestCase):
-
-    def test_build_plain_welcome_mail(self):
-        user_address = InputMail.FROM_EMAIL_ADDRESS = 'welcomed@user'
-        mail = build_welcome_mail()
-        self.assertEquals(user_address, mail.to)
-        self.assertEquals('Welcome to Pixelated Mail', mail.headers['Subject'])
-        self.assertIn('How to use it', mail.body)
-        self.assertIn('text/plain', mail._mime.as_string())
-        self.assertIn('text/html', mail._mime.as_string())
-        self.assertTrue(mail.headers['Date'])