Extracting controller classes

9 files changed, 288 insertions, 205 deletions

diff --git a/service/.gitignore b/service/.gitignore
index 3893e9cf..79b536ac 100644
--- a/service/.gitignore
+++ b/service/.gitignore
@@ -1,2 +1,3 @@
-.virtualenv
+.virtualenv/
+soledad-test/
 build/
diff --git a/service/pixelated/controllers/__init__.py b/service/pixelated/controllers/__init__.py
new file mode 100644
index 00000000..84d7bf4d
--- /dev/null
+++ b/service/pixelated/controllers/__init__.py
@@ -0,0 +1,29 @@
+#
+# 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/>.
+
+
+def respond_json(entity, status_code=200):
+    json_response = json.dumps(entity)
+    response = Response(response=json_response, mimetype="application/json")
+    response.status_code = status_code
+    return response
+
+
+import json
+from flask import Response
+from home_controller import HomeController
+from mails_controller import MailsController
+from tags_controller import TagsController
diff --git a/service/pixelated/controllers/home_controller.py b/service/pixelated/controllers/home_controller.py
new file mode 100644
index 00000000..69ecd52f
--- /dev/null
+++ b/service/pixelated/controllers/home_controller.py
@@ -0,0 +1,26 @@
+#
+# 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/>.
+
+from flask import current_app
+
+
+class HomeController:
+
+    def __init__(self):
+        pass
+
+    def home(self):
+        return current_app.send_static_file('index.html')
diff --git a/service/pixelated/controllers/mails_controller.py b/service/pixelated/controllers/mails_controller.py
new file mode 100644
index 00000000..26b35831
--- /dev/null
+++ b/service/pixelated/controllers/mails_controller.py
@@ -0,0 +1,111 @@
+#
+# 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 json
+from pixelated.adapter.pixelated_mail import InputMail
+from pixelated.controllers import respond_json
+from flask import request
+import dateutil.parser as dateparser
+
+
+class MailsController:
+
+    def __init__(self, mail_service, draft_service, search_engine):
+        self._mail_service = mail_service
+        self._draft_service = draft_service
+        self._search_engine = search_engine
+
+    def mails(self, _request=request):
+        mail_ids = self._search_engine.search(_request.args.get('q'))
+        mails = self._mail_service.mails(mail_ids)
+        mails = sorted(mails, key=lambda mail: dateparser.parse(mail.get_date()), reverse=True)
+
+        response = {
+            "stats": {
+                "total": len(mails),
+                "read": 0,
+                "starred": 0,
+                "replied": 0
+            },
+            "mails": [mail.as_dict() for mail in mails]
+        }
+
+        return respond_json(response)
+
+    def mail(self, mail_id):
+        mail = self._mail_service.mail(mail_id)
+        return respond_json(mail.as_dict())
+
+    def mark_mail_as_read(self, mail_id):
+        mail = self._mail_service.mark_as_read(mail_id)
+        self._search_engine.index_mail(mail)
+        return ""
+
+    def mark_mail_as_unread(self, mail_id):
+        mail = self._mail_service.mark_as_unread(mail_id)
+        self._search_engine.index_mail(mail)
+        return ""
+
+    def mark_many_mail_unread(self):
+        idents = json.loads(request.form['idents'])
+        for ident in idents:
+            self._mail_service.mark_as_unread(ident)
+        return ""
+
+    def delete_mail(self, mail_id):
+        trashed_mail = self._mail_service.delete_mail(mail_id)
+        self._search_engine.index_mail(trashed_mail)
+        return respond_json(None)
+
+    def delete_mails(self):
+        idents = json.loads(request.form['idents'])
+        for ident in idents:
+            self._mail_service.delete_mail(ident)
+        return respond_json(None)
+
+    def send_mail(self, _request=request):
+        try:
+            _mail = InputMail.from_dict(_request.json)
+            draft_id = _request.json.get('ident')
+            if draft_id:
+                self._search_engine.remove_from_index(draft_id)
+            _mail = self._mail_service.send(draft_id, _mail)
+            self._search_engine.index_mail(_mail)
+
+            return respond_json(_mail.as_dict())
+        except Exception as error:
+            return respond_json({'message': '\n'.join(list(error.args))}, status_code=500)
+
+    def mail_tags(self, mail_id):
+        new_tags = map(lambda tag: tag.lower(), request.get_json()['newtags'])
+        try:
+            tags = self._mail_service.update_tags(mail_id, new_tags)
+            self._search_engine.index_mail(self._mail_service.mail(mail_id))
+        except ValueError as ve:
+            return respond_json(ve.message, 403)
+        return respond_json(list(tags))
+
+    def update_draft(self):
+        _mail = InputMail.from_dict(request.json)
+        draft_id = request.json.get('ident')
+        if draft_id:
+            ident = self._draft_service.update_draft(draft_id, _mail).ident
+            self._search_engine.remove_from_index(draft_id)
+        else:
+            ident = self._draft_service.create_draft(_mail).ident
+
+        self._search_engine.index_mail(self._mail_service.mail(ident))
+        return respond_json({'ident': ident})
diff --git a/service/pixelated/controllers/tags_controller.py b/service/pixelated/controllers/tags_controller.py
new file mode 100644
index 00000000..52ed762a
--- /dev/null
+++ b/service/pixelated/controllers/tags_controller.py
@@ -0,0 +1,30 @@
+#
+# 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/>.
+
+from flask import request
+from pixelated.controllers import respond_json
+
+
+class TagsController:
+
+    def __init__(self, search_engine):
+        self._search_engine = search_engine
+
+    def tags(self):
+        query = request.args.get('q')
+        skip_default_tags = request.args.get('skipDefaultTags')
+        tags = self._search_engine.tags(query=query, skip_default_tags=skip_default_tags)
+        return respond_json(tags)
diff --git a/service/pixelated/user_agent.py b/service/pixelated/user_agent.py
index 64e639d0..6dca31ae 100644
--- a/service/pixelated/user_agent.py
+++ b/service/pixelated/user_agent.py
@@ -13,7 +13,6 @@
 #
 # 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 json
 import argparse
 import getpass
 
@@ -21,8 +20,6 @@ import os
 import os.path
 import crochet
 from flask import Flask
-from flask import request
-from flask import Response
 from pixelated.adapter.pixelated_mail_sender import PixelatedMailSender
 from pixelated.adapter.pixelated_mailboxes import PixelatedMailBoxes
 import pixelated.reactor_manager as reactor_manager
@@ -31,12 +28,13 @@ from pixelated.bitmask_libraries.config import LeapConfig
 from pixelated.bitmask_libraries.provider import LeapProvider
 from pixelated.bitmask_libraries.auth import LeapAuthenticator, LeapCredentials
 from pixelated.adapter.mail_service import MailService
-from pixelated.adapter.pixelated_mail import PixelatedMail, InputMail
+from pixelated.adapter.pixelated_mail import PixelatedMail
 from pixelated.adapter.soledad_querier import SoledadQuerier
 from pixelated.adapter.search import SearchEngine
 from pixelated.adapter.draft_service import DraftService
 from pixelated.adapter.listener import MailboxListener
-import dateutil.parser as dateparser
+from pixelated.controllers import *
+from pixelated.adapter.tag_service import TagService
 
 
 static_folder = os.path.abspath(os.path.join(os.path.abspath(__file__), "..", "..", "web-ui", "app"))
@@ -66,131 +64,6 @@ def features():
     return respond_json({'disabled_features': DISABLED_FEATURES, 'dispatcher_features': disabled_features})
 
 
-@app.route('/mails', methods=['POST'])
-def send_mail():
-    try:
-        _mail = InputMail.from_dict(request.json)
-        draft_id = request.json.get('ident')
-        if draft_id:
-            search_engine.remove_from_index(draft_id)
-        _mail = mail_service.send(draft_id, _mail)
-        search_engine.index_mail(_mail)
-
-        return respond_json(_mail.as_dict())
-    except Exception as error:
-        return respond_json({'message': '\n'.join(list(error.args))}, status_code=500)
-
-
-@app.route('/mails', methods=['PUT'])
-def update_draft():
-    _mail = InputMail.from_dict(request.json)
-    draft_id = request.json.get('ident')
-    if draft_id:
-        ident = draft_service.update_draft(draft_id, _mail).ident
-        search_engine.remove_from_index(draft_id)
-    else:
-        ident = draft_service.create_draft(_mail).ident
-
-    search_engine.index_mail(mail_service.mail(ident))
-    return respond_json({'ident': ident})
-
-
-@app.route('/mails')
-def mails():
-    mail_ids = search_engine.search(request.args.get('q'))
-    mails = mail_service.mails(mail_ids)
-    mails = sorted(mails, key=lambda mail: dateparser.parse(mail.get_date()), reverse=True)
-
-    response = {
-        "stats": {
-            "total": len(mails),
-            "read": 0,
-            "starred": 0,
-            "replied": 0
-        },
-        "mails": [mail.as_dict() for mail in mails]
-    }
-
-    return respond_json(response)
-
-
-@app.route('/mail/<mail_id>', methods=['DELETE'])
-def delete_mail(mail_id):
-    trashed_mail = mail_service.delete_mail(mail_id)
-    search_engine.index_mail(trashed_mail)
-    return respond_json(None)
-
-
-@app.route('/mails', methods=['DELETE'])
-def delete_mails():
-    idents = json.loads(request.form['idents'])
-    for ident in idents:
-        mail_service.delete_mail(ident)
-    return respond_json(None)
-
-
-@app.route('/tags')
-def tags():
-    query = request.args.get('q')
-    skip_default_tags = request.args.get('skipDefaultTags')
-    tags = search_engine.tags(query=query, skip_default_tags=skip_default_tags)
-    return respond_json(tags)
-
-
-@app.route('/mail/<mail_id>')
-def mail(mail_id):
-    mail = mail_service.mail(mail_id)
-    return respond_json(mail.as_dict())
-
-
-@app.route('/mail/<mail_id>/tags', methods=['POST'])
-def mail_tags(mail_id):
-    new_tags = map(lambda tag: tag.lower(), request.get_json()['newtags'])
-    try:
-        tags = mail_service.update_tags(mail_id, new_tags)
-        search_engine.index_mail(mail_service.mail(mail_id))
-    except ValueError as ve:
-        return respond_json(ve.message, 403)
-    return respond_json(list(tags))
-
-
-@app.route('/mail/<mail_id>/read', methods=['POST'])
-def mark_mail_as_read(mail_id):
-    mail = mail_service.mark_as_read(mail_id)
-    search_engine.index_mail(mail)
-    return ""
-
-
-@app.route('/mail/<mail_id>/unread', methods=['POST'])
-def mark_mail_as_unread(mail_id):
-    mail = mail_service.mark_as_unread(mail_id)
-    search_engine.index_mail(mail)
-    return ""
-
-
-@app.route('/mails/unread', methods=['POST'])
-def mark_many_mail_unread():
-    idents = json.loads(request.form['idents'])
-    for ident in idents:
-        mail_service.mark_as_unread(ident)
-    return ""
-
-
-@app.route('/contacts')
-def contacts():
-    pass
-
-
-@app.route('/draft_reply_for/<mail_id>')
-def draft_reply_for(mail_id):
-    pass
-
-
-@app.route('/')
-def index():
-    return app.send_static_file('index.html')
-
-
 def register_new_user(username):
     server_name = app.config['LEAP_SERVER_NAME']
     certs_home = os.path.abspath(os.path.join(os.path.abspath(__file__), "..", "certificates"))
@@ -202,27 +75,51 @@ def register_new_user(username):
     session.nicknym.generate_openpgp_key()
 
 
+def _setup_routes(app, home_controller, mails_controller, tags_controller):
+    # home
+    app.add_url_rule('/', methods=['GET'], view_func=home_controller.home)
+    # mails
+    app.add_url_rule('/mails', methods=['GET'], view_func=mails_controller.mails)
+    app.add_url_rule('/mail/<mail_id>/read', methods=['POST'], view_func=mails_controller.mark_mail_as_read)
+    app.add_url_rule('/mail/<mail_id>/unread', methods=['POST'], view_func=mails_controller.mark_mail_as_unread)
+    app.add_url_rule('/mails/unread', methods=['POST'], view_func=mails_controller.mark_many_mail_unread)
+    app.add_url_rule('/mail/<mail_id>', methods=['GET'], view_func=mails_controller.mail)
+    app.add_url_rule('/mail/<mail_id>', methods=['DELETE'], view_func=mails_controller.delete_mail)
+    app.add_url_rule('/mails', methods=['DELETE'], view_func=mails_controller.delete_mails)
+    app.add_url_rule('/mails', methods=['POST'], view_func=mails_controller.send_mail)
+    app.add_url_rule('/mail/<mail_id>/tags', methods=['POST'], view_func=mails_controller.mail_tags)
+    app.add_url_rule('/mails', methods=['PUT'], view_func=mails_controller.update_draft)
+    # tags
+    app.add_url_rule('/tags', methods=['GET'], view_func=tags_controller.tags)
+
+
 def start_user_agent(debug_enabled):
-    leap_session = LeapSession.open(app.config['LEAP_USERNAME'], app.config['LEAP_PASSWORD'],
-                                    app.config['LEAP_SERVER_NAME'])
-    soledad_querier = SoledadQuerier(soledad=leap_session.account._soledad)
-
-    PixelatedMail.from_email_address = leap_session.account_email()
-    pixelated_mailboxes = PixelatedMailBoxes(leap_session.account)
-    pixelated_mail_sender = PixelatedMailSender(leap_session.account_email())
-    from pixelated.adapter.tag_service import TagService
-    tag_service = TagService()
-    global mail_service
-    mail_service = MailService(pixelated_mailboxes, pixelated_mail_sender, tag_service, soledad_querier)
-    global search_engine
-    search_engine = SearchEngine()
-    MailboxListener.SEARCH_ENGINE = search_engine
-    search_engine.index_mails(mail_service.all_mails())
-    global draft_service
-    draft_service = DraftService(pixelated_mailboxes)
-
-    app.run(host=app.config['HOST'], debug=debug_enabled,
-            port=app.config['PORT'], use_reloader=False)
+    with app.app_context():
+        leap_session = LeapSession.open(app.config['LEAP_USERNAME'], app.config['LEAP_PASSWORD'],
+                                        app.config['LEAP_SERVER_NAME'])
+        soledad_querier = SoledadQuerier(soledad=leap_session.account._soledad)
+
+        PixelatedMail.from_email_address = leap_session.account_email()
+        pixelated_mailboxes = PixelatedMailBoxes(leap_session.account, soledad_querier)
+        pixelated_mail_sender = PixelatedMailSender(leap_session.account_email())
+
+        tag_service = TagService()
+        mail_service = MailService(pixelated_mailboxes, pixelated_mail_sender, tag_service, soledad_querier)
+        search_engine = SearchEngine()
+        MailboxListener.SEARCH_ENGINE = search_engine
+        search_engine.index_mails(mail_service.all_mails())
+        draft_service = DraftService(pixelated_mailboxes)
+
+        home_controller = HomeController()
+        mails_controller = MailsController(mail_service=mail_service,
+                                           draft_service=draft_service,
+                                           search_engine=search_engine)
+        tags_controller = TagsController(search_engine=search_engine)
+
+        _setup_routes(app, home_controller, mails_controller, tags_controller)
+
+        app.run(host=app.config['HOST'], debug=debug_enabled,
+                port=app.config['PORT'], use_reloader=False)
 
 
 def setup():
@@ -233,7 +130,8 @@ def setup():
         parser.add_argument('--debug', action='store_true',
                             help='DEBUG mode.')
         parser.add_argument('--register', metavar='username', help='register user with name.')
-        parser.add_argument('-c', '--config', metavar='configfile', default=default_config_path, help='use specified config file. Default is ~/.pixelated.')
+        parser.add_argument('-c', '--config', metavar='configfile', default=default_config_path,
+                            help='use specified config file. Default is ~/.pixelated.')
 
         args = parser.parse_args()
         debug_enabled = args.debug or os.environ.get('DEBUG', False)
@@ -249,5 +147,6 @@ def setup():
     finally:
         reactor_manager.stop_reactor_on_exit()
 
+
 if __name__ == '__main__':
     setup()
diff --git a/service/test/support/integration_helper.py b/service/test/support/integration_helper.py
index 2316774a..3c617438 100644
--- a/service/test/support/integration_helper.py
+++ b/service/test/support/integration_helper.py
@@ -13,11 +13,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 json
 import shutil
 
 from leap.soledad.client import Soledad
-from mockito import mock, unstub
+from mockito import mock
 import os
 from mock import Mock
 from pixelated.adapter.mail_service import MailService
@@ -29,6 +28,7 @@ import pixelated.user_agent
 from pixelated.adapter.pixelated_mail import PixelatedMail, InputMail
 from pixelated.adapter.pixelated_mailboxes import PixelatedMailBoxes
 from pixelated.adapter.soledad_querier import SoledadQuerier
+from pixelated.controllers import *
 
 soledad_test_folder = "soledad-test"
 
@@ -50,6 +50,9 @@ class FakeAccount:
 
 
 def initialize_soledad(tempdir):
+    if os.path.isdir(soledad_test_folder):
+        shutil.rmtree(soledad_test_folder)
+
     uuid = "foobar-uuid"
     passphrase = u"verysecretpassphrase"
     secret_path = os.path.join(tempdir, "secret.gpg")
@@ -125,17 +128,18 @@ class MailBuilder:
 
 
 class SoledadTestBase:
-    def teardown_soledad(self):
-        self.soledad.close()
-        shutil.rmtree(soledad_test_folder)
+    def __init__(self):
+        pass
 
-    def setup_soledad(self):
-        unstub()  # making sure all mocks from other tests are reset
+    def teardown_soledad(self):
+        pass
 
-        # making sure soledad test folder is not there
-        if (os.path.isdir(soledad_test_folder)):
-            shutil.rmtree(soledad_test_folder)
+    def _reset_routes(self, app):
+        static_files_route = app.view_functions['static']
+        disabled_features_route = app.view_functions['features']
+        app.view_functions = {'static': static_files_route, 'features': disabled_features_route}
 
+    def setup_soledad(self):
         self.soledad = initialize_soledad(tempdir=soledad_test_folder)
         self.mail_address = "test@pixelated.org"
 
@@ -144,54 +148,59 @@ class SoledadTestBase:
         pixelated.user_agent.DISABLED_FEATURES.append('autoReload')
         SearchEngine.INDEX_FOLDER = soledad_test_folder + '/search_index'
 
-        self.app = pixelated.user_agent.app.test_client()
+        self.client = pixelated.user_agent.app.test_client()
 
+        self._reset_routes(self.client.application)
         self.soledad_querier = SoledadQuerier(self.soledad)
         self.account = FakeAccount()
         self.pixelated_mailboxes = PixelatedMailBoxes(self.account, self.soledad_querier)
         self.mail_sender = mock()
         self.tag_service = TagService()
         self.draft_service = DraftService(self.pixelated_mailboxes)
-        self.mail_service = MailService(self.pixelated_mailboxes, self.mail_sender, self.tag_service, self.soledad_querier)
+        self.mail_service = MailService(self.pixelated_mailboxes, self.mail_sender, self.tag_service,
+                                        self.soledad_querier)
         self.search_engine = SearchEngine()
         self.search_engine.index_mails(self.mail_service.all_mails())
 
-        pixelated.user_agent.mail_service = self.mail_service
-        pixelated.user_agent.draft_service = self.draft_service
-        pixelated.user_agent.tag_service = self.tag_service
-        pixelated.user_agent.search_engine = self.search_engine
+        home_controller = HomeController()
+        mails_controller = MailsController(mail_service=self.mail_service,
+                                           draft_service=self.draft_service,
+                                           search_engine=self.search_engine)
+        tags_controller = TagsController(search_engine=self.search_engine)
+
+        pixelated.user_agent._setup_routes(self.client.application, home_controller, mails_controller, tags_controller)
 
     def get_mails_by_tag(self, tag):
-        response = json.loads(self.app.get("/mails?q=tag:" + tag).data)
+        response = json.loads(self.client.get("/mails?q=tag:" + tag).data)
         return [ResponseMail(m) for m in response['mails']]
 
     def post_mail(self, data):
-        response = json.loads(self.app.post('/mails', data=data, content_type="application/json").data)
+        response = json.loads(self.client.post('/mails', data=data, content_type="application/json").data)
         return ResponseMail(response)
 
     def put_mail(self, data):
-        response = json.loads(self.app.put('/mails', data=data, content_type="application/json").data)
+        response = json.loads(self.client.put('/mails', data=data, content_type="application/json").data)
         return response['ident']
 
     def post_tags(self, mail_ident, tags_json):
         return json.loads(
-            self.app.post('/mail/' + mail_ident + '/tags', data=tags_json, content_type="application/json").data)
+            self.client.post('/mail/' + mail_ident + '/tags', data=tags_json, content_type="application/json").data)
 
     def get_tags(self, query_string=""):
         return json.loads(
-            self.app.get('/tags' + query_string, content_type="application/json").data)
+            self.client.get('/tags' + query_string, content_type="application/json").data)
 
     def delete_mail(self, mail_ident):
-        self.app.delete('/mail/' + mail_ident)
+        self.client.delete('/mail/' + mail_ident)
 
     def mark_as_read(self, mail_ident):
-        self.app.post('/mail/' + mail_ident + '/read', content_type="application/json")
+        self.client.post('/mail/' + mail_ident + '/read', content_type="application/json")
 
     def mark_as_unread(self, mail_ident):
-        self.app.post('/mail/' + mail_ident + '/unread', content_type="application/json")
+        self.client.post('/mail/' + mail_ident + '/unread', content_type="application/json")
 
     def mark_many_as_unread(self, idents):
-        self.app.post('/mails/unread', data={'idents': json.dumps(idents)})
+        self.client.post('/mails/unread', data={'idents': json.dumps(idents)})
 
     def add_mail_to_inbox(self, input_mail):
         mail = self.pixelated_mailboxes.inbox().add(input_mail)
diff --git a/service/test/support/test_helper.py b/service/test/support/test_helper.py
index 66ed9a10..4ea4afb5 100644
--- a/service/test/support/test_helper.py
+++ b/service/test/support/test_helper.py
@@ -70,3 +70,9 @@ def input_mail():
     mail._chash = "123"
     mail.as_dict = lambda: None
     return mail
+
+
+class TestRequest:
+
+    def __init__(self, json):
+        self.json = json
diff --git a/service/test/unit/user_agent_test.py b/service/test/unit/user_agent_test.py
index 0ea83a5d..49a70dd6 100644
--- a/service/test/unit/user_agent_test.py
+++ b/service/test/unit/user_agent_test.py
@@ -46,34 +46,6 @@ class UserAgentTest(unittest.TestCase):
     def tearDown(self):
         unstub()
 
-    def test_sending_mail_return_sent_mail_data_when_send_succeeds(self):
-        self.input_mail = test_helper.input_mail()
-        when(self.mail_service).send(1, self.input_mail).thenReturn(self.input_mail)
-        self.input_mail.as_dict = lambda: {'header': {'from': 'a@a.a', 'to': 'b@b.b'},
-                                           'ident': 1,
-                                           'tags': [],
-                                           'status': [],
-                                           'security_casing': {},
-                                           'body': 'email body'}
-
-        result = self.app.post('/mails', data='{"ident":1}', content_type="application/json")
-
-        self.assertEqual(result.status_code, 200)
-        self.assertEqual(result.data, '{"status": [], "body": "email body", "ident": 1, "tags": [], "header": {"to": "b@b.b", "from": "a@a.a"}, "security_casing": {}}')
-
-    def test_sending_mail_return_error_message_when_send_fails(self):
-        self.input_mail = test_helper.input_mail()
-
-        def send_that_throws_exception(id, mail):
-            raise Exception('email sending failed', 'more information of error')
-
-        self.mail_service.send = send_that_throws_exception
-
-        result = self.app.post('/mails', data='{"ident":1}', content_type="application/json")
-
-        self.assertEqual(result.status_code, 500)
-        self.assertEqual(result.data, '{"message": "email sending failed\\nmore information of error"}')
-
     def test_that_default_config_file_is_home_dot_pixelated(self):
         orig_config = pixelated.user_agent.app.config
         try: