32 files changed, 90 insertions, 171 deletions
diff --git a/service/test/functional/features/environment.py b/service/test/functional/features/environment.py
index 72140e40..5e93c840 100644
--- a/service/test/functional/features/environment.py
+++ b/service/test/functional/features/environment.py
@@ -19,14 +19,14 @@ from test.support.dispatcher.proxy import Proxy
 
 from test.support.integration import AppTestClient
 from selenium import webdriver
-from pixelated.controllers.features_controller import FeaturesController
+from pixelated.resources.features_resource import FeaturesResource
 
 
 def before_all(context):
     logging.disable('INFO')
     client = AppTestClient()
     proxy = Proxy(proxy_port='8889', app_port='4567')
-    FeaturesController.DISABLED_FEATURES.append('autoRefresh')
+    FeaturesResource.DISABLED_FEATURES.append('autoRefresh')
     context.client = client
     context.call_to_terminate_proxy = proxy.run_on_a_thread()
     context.call_to_terminate = client.run_on_a_thread(logfile='/tmp/behave-tests.log')
diff --git a/service/test/integration/contacts_test.py b/service/test/integration/test_contacts.py
index 925e5e02..925e5e02 100644
--- a/service/test/integration/contacts_test.py
+++ b/service/test/integration/test_contacts.py
diff --git a/service/test/integration/delete_mail_test.py b/service/test/integration/test_delete_mail.py
index 5a3a97fb..5a3a97fb 100644
--- a/service/test/integration/delete_mail_test.py
+++ b/service/test/integration/test_delete_mail.py
diff --git a/service/test/integration/drafts_test.py b/service/test/integration/test_drafts.py
index d4fde099..d4fde099 100644
--- a/service/test/integration/drafts_test.py
+++ b/service/test/integration/test_drafts.py
diff --git a/service/test/integration/mark_as_read_unread_test.py b/service/test/integration/test_mark_as_read_unread.py
index 86a48e62..86a48e62 100644
--- a/service/test/integration/mark_as_read_unread_test.py
+++ b/service/test/integration/test_mark_as_read_unread.py
diff --git a/service/test/integration/retrieve_attachment_test.py b/service/test/integration/test_retrieve_attachment.py
index 5f754a27..d6ad9298 100644
--- a/service/test/integration/retrieve_attachment_test.py
+++ b/service/test/integration/test_retrieve_attachment.py
@@ -36,6 +36,10 @@ class RetrieveAttachmentTest(SoledadTestBase):
 
         self.client.add_document_to_soledad(attachment_dict)
 
-        attachment = self.get_attachment(ident, 'base64')
+        d = self.get_attachment(ident, 'base64')
 
-        self.assertEquals('pequeno anexo :D\n', attachment)
+        def _assert(attachment):
+            self.assertEquals('pequeno anexo :D\n', attachment)
+        d.addCallback(_assert)
+
+        return d
diff --git a/service/test/integration/search_test.py b/service/test/integration/test_search.py
index 464830d2..464830d2 100644
--- a/service/test/integration/search_test.py
+++ b/service/test/integration/test_search.py
diff --git a/service/test/integration/soledad_querier_test.py b/service/test/integration/test_soledad_querier.py
index f8767630..f8767630 100644
--- a/service/test/integration/soledad_querier_test.py
+++ b/service/test/integration/test_soledad_querier.py
diff --git a/service/test/integration/tags_test.py b/service/test/integration/test_tags.py
index 6072392c..6072392c 100644
--- a/service/test/integration/tags_test.py
+++ b/service/test/integration/test_tags.py
diff --git a/service/test/support/integration/app_test_client.py b/service/test/support/integration/app_test_client.py
index eab001c6..860b9c40 100644
--- a/service/test/support/integration/app_test_client.py
+++ b/service/test/support/integration/app_test_client.py
@@ -18,8 +18,6 @@ import multiprocessing
 import shutil
 import time
 
-from pixelated.config.routes import setup_routes
-from klein.test_resource import requestMock, _render
 from leap.mail.imap.account import SoledadBackedAccount
 from leap.soledad.client import Soledad
 from mock import MagicMock, Mock
@@ -29,16 +27,23 @@ from pixelated.adapter.services.mail_service import MailService
 from pixelated.adapter.services.mailboxes import Mailboxes
 from pixelated.adapter.soledad.soledad_querier import SoledadQuerier
 from pixelated.adapter.services.tag_service import TagService
-from pixelated.controllers import FeaturesController, HomeController, MailsController, TagsController, \
-    SyncInfoController, AttachmentsController, ContactsController
+from pixelated.resources.root_resource import RootResource
 import pixelated.runserver
 from pixelated.adapter.model.mail import PixelatedMail
 from pixelated.adapter.search import SearchEngine
 from test.support.integration.model import MailBuilder
+from test.support.test_helper import request_mock
+from twisted.internet import reactor
+from twisted.internet.defer import Deferred
+from twisted.web.resource import getChildForRequest
+from twisted.web.server import Site
 
 
 class AppTestClient:
-    def __init__(self, soledad_test_folder='soledad-test/test'):
+    INDEX_KEY = '\xde3?\x87\xff\xd9\xd3\x14\xf0\xa7>\x1f%C{\x16.\\\xae\x8c\x13\xa7\xfb\x04\xd4]+\x8d_\xed\xd1\x8d\x0bI' \
+                '\x8a\x0e\xa4tm\xab\xbf\xb4\xa5\x99\x00d\xd5w\x9f\x18\xbc\x1d\xd4_W\xd2\xb6\xe8H\x83\x1b\xd8\x9d\xad'
+
+    def __init__(self, soledad_test_folder='/tmp/soledad-test/test'):
 
         self.soledad = initialize_soledad(tempdir=soledad_test_folder)
         self.mail_address = "test@pixelated.org"
@@ -51,7 +56,7 @@ class AppTestClient:
         self.app = pixelated.runserver.app
 
         self.soledad_querier = SoledadQuerier(self.soledad)
-        self.soledad_querier.get_index_masterkey = lambda: '\xde3?\x87\xff\xd9\xd3\x14\xf0\xa7>\x1f%C{\x16.\\\xae\x8c\x13\xa7\xfb\x04\xd4]+\x8d_\xed\xd1\x8d\x0bI\x8a\x0e\xa4tm\xab\xbf\xb4\xa5\x99\x00d\xd5w\x9f\x18\xbc\x1d\xd4_W\xd2\xb6\xe8H\x83\x1b\xd8\x9d\xad'
+        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)
@@ -63,55 +68,59 @@ class AppTestClient:
         self.search_engine = SearchEngine(self.soledad_querier)
         self.search_engine.index_mails(self.mail_service.all_mails())
 
-        features_controller = FeaturesController()
-        features_controller.DISABLED_FEATURES.append('autoReload')
-        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)
-        contacts_controller = ContactsController(search_engine=self.search_engine)
-        sync_info_controller = SyncInfoController()
-        attachments_controller = AttachmentsController(self.soledad_querier)
+        self.app.resource = RootResource()
 
-        setup_routes(self.app, home_controller, mails_controller, tags_controller,
-                     features_controller, sync_info_controller, attachments_controller, contacts_controller)
+        self.app.resource.initialize(self.soledad_querier, self.search_engine, self.mail_service, self.draft_service)
 
     def _render(self, request, as_json=True):
+        def get_str(_str):
+            return json.loads(_str) if as_json else _str
+
         def get_request_written_data(_=None):
             written_data = request.getWrittenData()
             if written_data:
-                return json.loads(written_data) if as_json else written_data
+                return get_str(written_data)
+
+        resource = getChildForRequest(self.app.resource, request)
+        result = resource.render(request)
+
+        if isinstance(result, basestring):
+            return get_str(result), request
 
-        d = _render(self.app.resource(), request)
         if request.finished:
-            return get_request_written_data(), request
+            d = Deferred()
+            d.addCallback(get_request_written_data)
+            return d, request
         else:
+            d = request.notifyFinish()
+            d.addCallback(lambda _: request)
             d.addCallback(get_request_written_data)
             return d, request
 
-    def run_on_a_thread(self, logfile='/tmp/app_test_client.log', port=4567, host='localhost'):
-        worker = lambda: self.app.run(host=host, port=port, logFile=open(logfile, 'w'))
-        process = multiprocessing.Process(target=worker)
+    def run_on_a_thread(self, logfile='/tmp/app_test_client.log', port=4567, host='0.0.0.0'):
+        def _start():
+            reactor.listenTCP(port, Site(self.app.resource), interface=host)
+            reactor.run()
+        process = multiprocessing.Process(target=_start)
         process.start()
-        time.sleep(1)  # just let it start
+        time.sleep(1)
         return lambda: process.terminate()
 
     def get(self, path, get_args, as_json=True):
-        request = requestMock(path)
+        request = request_mock(path)
         request.args = get_args
         return self._render(request, as_json)
 
     def post(self, path, body=''):
-        request = requestMock(path=path, method="POST", body=body, headers={'Content-Type': ['application/json']})
+        request = request_mock(path=path, method="POST", body=body, headers={'Content-Type': ['application/json']})
         return self._render(request)
 
     def put(self, path, body):
-        request = requestMock(path=path, method="PUT", body=body, headers={'Content-Type': ['application/json']})
+        request = request_mock(path=path, method="PUT", body=body, headers={'Content-Type': ['application/json']})
         return self._render(request)
 
     def delete(self, path, body=""):
-        request = requestMock(path=path, body=body, headers={'Content-Type': ['application/json']}, method="DELETE")
+        request = request_mock(path=path, body=body, headers={'Content-Type': ['application/json']}, method="DELETE")
         return self._render(request)
 
     def add_document_to_soledad(self, _dict):
diff --git a/service/test/support/integration/soledad_test_base.py b/service/test/support/integration/soledad_test_base.py
index 4149462c..5892de60 100644
--- a/service/test/support/integration/soledad_test_base.py
+++ b/service/test/support/integration/soledad_test_base.py
@@ -15,7 +15,7 @@
 # along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
 import unittest
 
-from pixelated.controllers import *
+from pixelated.resources import *
 from test.support.integration.app_test_client import AppTestClient
 from test.support.integration.model import ResponseMail
 
diff --git a/service/test/support/test_helper.py b/service/test/support/test_helper.py
index ff1de64a..54685008 100644
--- a/service/test/support/test_helper.py
+++ b/service/test/support/test_helper.py
@@ -14,6 +14,7 @@
 # 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 datetime import datetime
+import io
 
 from pixelated.adapter.model.mail import InputMail
 
@@ -79,3 +80,26 @@ class TestRequest:
 
     def __init__(self, json):
         self.json = json
+
+
+from twisted.web.test.test_web import DummyRequest
+
+
+class PixRequestMock(DummyRequest):
+    def __init__(self, path):
+        DummyRequest.__init__(self, path)
+        self.content = None
+        self.code = None
+
+    def getWrittenData(self):
+        if len(self.written):
+            return self.written[0]
+
+
+def request_mock(path='', method='GET', body='', headers={}):
+    dummy = PixRequestMock(path.split('/'))
+    for name, value in headers.iteritems():
+        dummy.setHeader(name, value)
+    dummy.method = method
+    dummy.content = io.BytesIO(body)
+    return dummy
diff --git a/service/test/unit/adapter/draft_service_test.py b/service/test/unit/adapter/test_draft_service.py
index baa07ce0..baa07ce0 100644
--- a/service/test/unit/adapter/draft_service_test.py
+++ b/service/test/unit/adapter/test_draft_service.py
diff --git a/service/test/unit/adapter/mail_test.py b/service/test/unit/adapter/test_mail.py
index be7b731d..be7b731d 100644
--- a/service/test/unit/adapter/mail_test.py
+++ b/service/test/unit/adapter/test_mail.py
diff --git a/service/test/unit/adapter/mail_service_test.py b/service/test/unit/adapter/test_mail_service.py
index fca6e79b..fca6e79b 100644
--- a/service/test/unit/adapter/mail_service_test.py
+++ b/service/test/unit/adapter/test_mail_service.py
diff --git a/service/test/unit/adapter/mailbox_test.py b/service/test/unit/adapter/test_mailbox.py
index 9725f418..9725f418 100644
--- a/service/test/unit/adapter/mailbox_test.py
+++ b/service/test/unit/adapter/test_mailbox.py
diff --git a/service/test/unit/adapter/mailbox_indexer_listener_test.py b/service/test/unit/adapter/test_mailbox_indexer_listener.py
index 65ba8966..65ba8966 100644
--- a/service/test/unit/adapter/mailbox_indexer_listener_test.py
+++ b/service/test/unit/adapter/test_mailbox_indexer_listener.py
diff --git a/service/test/unit/adapter/soledad_querier_test.py b/service/test/unit/adapter/test_soledad_querier.py
index 2cc23750..2cc23750 100644
--- a/service/test/unit/adapter/soledad_querier_test.py
+++ b/service/test/unit/adapter/test_soledad_querier.py
diff --git a/service/test/unit/bitmask_libraries/abstract_leap_test.py b/service/test/unit/bitmask_libraries/test_abstract_leap.py
index 2634f330..2634f330 100644
--- a/service/test/unit/bitmask_libraries/abstract_leap_test.py
+++ b/service/test/unit/bitmask_libraries/test_abstract_leap.py
diff --git a/service/test/unit/bitmask_libraries/certs_test.py b/service/test/unit/bitmask_libraries/test_certs.py
index 8caafe7e..8caafe7e 100644
--- a/service/test/unit/bitmask_libraries/certs_test.py
+++ b/service/test/unit/bitmask_libraries/test_certs.py
diff --git a/service/test/unit/bitmask_libraries/leap_srp_test.py b/service/test/unit/bitmask_libraries/test_leap_srp.py
index 6d067e5d..6d067e5d 100644
--- a/service/test/unit/bitmask_libraries/leap_srp_test.py
+++ b/service/test/unit/bitmask_libraries/test_leap_srp.py
diff --git a/service/test/unit/bitmask_libraries/nicknym_test.py b/service/test/unit/bitmask_libraries/test_nicknym.py
index 9d564abe..7dec4b2c 100644
--- a/service/test/unit/bitmask_libraries/nicknym_test.py
+++ b/service/test/unit/bitmask_libraries/test_nicknym.py
@@ -17,7 +17,7 @@ from mock import patch
 
 from leap.keymanager import openpgp, KeyNotFound
 from pixelated.bitmask_libraries.nicknym import NickNym
-from abstract_leap_test import AbstractLeapTest
+from test_abstract_leap import AbstractLeapTest
 
 
 class NickNymTest(AbstractLeapTest):
diff --git a/service/test/unit/bitmask_libraries/provider_test.py b/service/test/unit/bitmask_libraries/test_provider.py
index dd57afa0..af8aa291 100644
--- a/service/test/unit/bitmask_libraries/provider_test.py
+++ b/service/test/unit/bitmask_libraries/test_provider.py
@@ -19,7 +19,7 @@ from httmock import all_requests, HTTMock, urlmatch
 from requests import HTTPError
 from pixelated.bitmask_libraries.config import LeapConfig
 from pixelated.bitmask_libraries.provider import LeapProvider
-from abstract_leap_test import AbstractLeapTest
+from test_abstract_leap import AbstractLeapTest
 
 
 @all_requests
diff --git a/service/test/unit/bitmask_libraries/session_test.py b/service/test/unit/bitmask_libraries/test_session.py
index 32d92f25..67722557 100644
--- a/service/test/unit/bitmask_libraries/session_test.py
+++ b/service/test/unit/bitmask_libraries/test_session.py
@@ -14,12 +14,20 @@
 # 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 mock import patch
+from mock import MagicMock
 
 from pixelated.bitmask_libraries.session import LeapSession
-from abstract_leap_test import AbstractLeapTest
+from test_abstract_leap import AbstractLeapTest
 
 
 class SessionTest(AbstractLeapTest):
+
+    def setUp(self):
+        self.mail_fetcher_mock = MagicMock()
+
+    def tearDown(self):
+        self.mail_fetcher_mock = MagicMock()
+
     def test_background_jobs_are_started(self):
         self.config.start_background_jobs = True
 
diff --git a/service/test/unit/bitmask_libraries/smtp_test.py b/service/test/unit/bitmask_libraries/test_smtp.py
index b00a0af6..4087cbf5 100644
--- a/service/test/unit/bitmask_libraries/smtp_test.py
+++ b/service/test/unit/bitmask_libraries/test_smtp.py
@@ -17,7 +17,7 @@ import sys
 
 import os
 from mock import MagicMock, patch
-from abstract_leap_test import AbstractLeapTest
+from test_abstract_leap import AbstractLeapTest
 from pixelated.bitmask_libraries.smtp import LeapSmtp
 from httmock import all_requests, HTTMock, urlmatch
 
diff --git a/service/test/unit/bitmask_libraries/soledad_test.py b/service/test/unit/bitmask_libraries/test_soledad.py
index c8b45710..a71275e0 100644
--- a/service/test/unit/bitmask_libraries/soledad_test.py
+++ b/service/test/unit/bitmask_libraries/test_soledad.py
@@ -15,7 +15,7 @@
 # along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
 from mock import patch
 from pixelated.bitmask_libraries.soledad import SoledadSession
-from abstract_leap_test import AbstractLeapTest
+from test_abstract_leap import AbstractLeapTest
 
 
 @patch('pixelated.bitmask_libraries.soledad.Soledad')
diff --git a/service/test/unit/config/app_factory_test.py b/service/test/unit/config/test_app_factory.py
index a42c7c83..a42c7c83 100644
--- a/service/test/unit/config/app_factory_test.py
+++ b/service/test/unit/config/test_app_factory.py
diff --git a/service/test/unit/controllers/mails_controller_test.py b/service/test/unit/controllers/mails_controller_test.py
deleted file mode 100644
index 8108bc19..00000000
--- a/service/test/unit/controllers/mails_controller_test.py
+++ /dev/null
@@ -1,126 +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 json
-import unittest
-from io import BytesIO
-
-from klein.test_resource import requestMock
-from mock import MagicMock
-from mockito import *
-from pixelated.controllers.mails_controller import MailsController
-
-
-class TestMailsController(unittest.TestCase):
-
-    def setUp(self):
-        self.mail_service = mock()
-        self.search_engine = mock()
-        self.dummy_request = MagicMock(spec=['code', 'responseHeaders'])
-        draft_service = mock()
-
-        self.mails_controller = MailsController(mail_service=self.mail_service,
-                                                draft_service=draft_service,
-                                                search_engine=self.search_engine)
-
-        self.input_mail = mock()
-        self.input_mail.json = {'header': {'from': 'a@a.a', 'to': 'b@b.b'},
-                                'ident': 1,
-                                'tags': [],
-                                'status': [],
-                                'security_casing': {},
-                                'body': 'email body'}
-
-    def tearDown(self):
-        unstub()
-
-    def test_sending_mail_return_sent_mail_data_when_send_succeeds(self):
-        self.mail_service.send = self._successfuly_send_mail
-        request = requestMock('', body=json.dumps(self.input_mail.json))
-
-        result = self.mails_controller.send_mail(request)
-
-        self.assertEqual(request.code, 200)
-        self.assertEqual(result,
-                         '{"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.mail_service.send = self._send_that_throws_exception
-
-        request = requestMock('', body=json.dumps(self.input_mail.json))
-        result = self.mails_controller.send_mail(request)
-
-        self.assertEqual(request.code, 422)
-        self.assertEqual(result,
-                         '{"message": "email sending failed\\nmore information of error\\n123\\nthere was a code before this"}')
-
-    def test_fetching_mail_gets_mail_from_mail_service(self):
-        mail = mock()
-        mail.as_dict = lambda: {'ident': 1, 'body': 'le mail body'}
-        when(self.mail_service).mail(1).thenReturn(mail)
-
-        response = self.mails_controller.mail(self.dummy_request, 1)
-
-        verify(self.mail_service).mail(1)
-        self.assertEqual(response, '{"body": "le mail body", "ident": 1}')
-
-    def test_marking_mail_as_read_set_mail_as_read_on_the_service(self):
-        mail = mock()
-        when(self.mail_service).mark_as_read("1").thenReturn(mail)
-        when(self.search_engine).index_mail(mail).thenReturn(None)
-        self.dummy_request.content = BytesIO('{"idents":["1"]}')
-
-        self.mails_controller.mark_many_mail_read(self.dummy_request)
-
-        verify(self.mail_service).mark_as_read(u'1')
-        verify(self.search_engine).index_mail(mail)
-
-    def test_marking_mail_as_unread_set_mail_as_unread_on_the_service(self):
-        mail = mock()
-        when(self.mail_service).mark_as_unread("1").thenReturn(mail)
-        when(self.search_engine).index_mail(mail).thenReturn(None)
-        self.dummy_request.content = BytesIO('{"idents":["1"]}')
-
-        self.mails_controller.mark_many_mail_unread(self.dummy_request)
-
-        verify(self.mail_service).mark_as_unread(u'1')
-        verify(self.search_engine).index_mail(mail)
-
-    def test_move_message_to_trash(self):
-        mail = mock()
-        mail.mailbox_name = 'INBOX'
-        when(self.mail_service).mail(1).thenReturn(mail)
-        when(self.mail_service).delete_mail(1).thenReturn(mail)
-
-        self.mails_controller.delete_mail(self.dummy_request, 1)
-
-        verify(self.search_engine).index_mail(mail)
-
-    def test_delete_permanently_when_mail_in_trash(self):
-        mail = mock()
-        mail.mailbox_name = 'TRASH'
-        when(self.mail_service).mail(1).thenReturn(mail)
-        self.mails_controller.delete_mail(self.dummy_request, 1)
-
-        verify(self.mail_service).delete_permanent(1)
-
-    def _successfuly_send_mail(self, ident, mail):
-        sent_mail = mock()
-        sent_mail.as_dict = lambda: self.input_mail.json
-
-        return sent_mail
-
-    def _send_that_throws_exception(self, ident, mail):
-        raise Exception('email sending failed', 'more information of error', 123, 'there was a code before this')
diff --git a/service/test/unit/controllers/__init__.py b/service/test/unit/resources/__init__.py
index e69de29b..e69de29b 100644
--- a/service/test/unit/controllers/__init__.py
+++ b/service/test/unit/resources/__init__.py
diff --git a/service/test/unit/controllers/sync_info_controller_test.py b/service/test/unit/resources/test_sync_info_controller.py
index cd3aeb02..a91dd386 100644
--- a/service/test/unit/controllers/sync_info_controller_test.py
+++ b/service/test/unit/resources/test_sync_info_controller.py
@@ -16,16 +16,16 @@
 import unittest
 import json
 
-from mock import MagicMock
-from pixelated.controllers import SyncInfoController
+from test.support.test_helper import request_mock
+from pixelated.resources.sync_info_resource import SyncInfoResource
 from mockito import *
 
 
-class SyncInfoControllerTest(unittest.TestCase):
+class SyncInfoResourceTest(unittest.TestCase):
 
     def setUp(self):
-        self.dummy_request = MagicMock()
-        self.controller = SyncInfoController()
+        self.dummy_request = request_mock()
+        self.controller = SyncInfoResource()
 
     def _set_count(self, current, total):
         soledad_sync_data = mock()
@@ -33,7 +33,7 @@ class SyncInfoControllerTest(unittest.TestCase):
         self.controller.set_sync_info(soledad_sync_data)
 
     def get_sync_info(self):
-        return json.loads(self.controller.sync_info(self.dummy_request))
+        return json.loads(self.controller.render_GET(self.dummy_request))
 
     def test_is_not_syncing_if_total_is_equal_to_current(self):
         self._set_count(total=0, current=0)
diff --git a/service/test/unit/support/encrypted_file_storage_test.py b/service/test/unit/support/test_encrypted_file_storage.py
index 2a6735c3..2a6735c3 100644
--- a/service/test/unit/support/encrypted_file_storage_test.py
+++ b/service/test/unit/support/test_encrypted_file_storage.py
diff --git a/service/test/unit/runserver_test.py b/service/test/unit/test_runserver.py
index 99b502f1..99b502f1 100644
--- a/service/test/unit/runserver_test.py
+++ b/service/test/unit/test_runserver.py