From 206423b83b910308bd9c314af03cf82e9a821974 Mon Sep 17 00:00:00 2001
From: Roald de Vries <rdevries@thoughtworks.com>
Date: Tue, 6 Dec 2016 11:55:52 +0100
Subject: remove some TODO's

---
 service/pixelated/application.py                    |  7 ++++---
 service/pixelated/resources/auth.py                 |  1 -
 service/test/support/integration/app_test_client.py | 14 --------------
 service/test/unit/resources/test_root_resource.py   |  2 --
 4 files changed, 4 insertions(+), 20 deletions(-)

(limited to 'service')

diff --git a/service/pixelated/application.py b/service/pixelated/application.py
index 1dc38d3c..da667820 100644
--- a/service/pixelated/application.py
+++ b/service/pixelated/application.py
@@ -43,9 +43,10 @@ log = Logger()
 
 
 def get_static_folder():
-    # TODO: make sure sandbox keeps working
-    # TODO: make sure this works for packaging
-    return os.path.abspath(os.path.join(os.path.dirname(os.path.abspath(__file__)), "..", "..", "web-ui", "public"))
+    static_folder = os.path.abspath(os.path.join(os.path.dirname(os.path.abspath(__file__)), "..", "..", "web-ui", "public"))
+    if not os.path.exists(static_folder):
+        static_folder = os.path.join('/', 'usr', 'share', 'pixelated-user-agent')
+    return static_folder
 
 
 class UserAgentMode(object):
diff --git a/service/pixelated/resources/auth.py b/service/pixelated/resources/auth.py
index a2054f18..38045277 100644
--- a/service/pixelated/resources/auth.py
+++ b/service/pixelated/resources/auth.py
@@ -103,7 +103,6 @@ class PixelatedAuthSessionWrapper(object):
     def _login(self, credentials, request):
         def loginSucceeded(args):
             interface, avatar, logout = args
-            # TODO: make sandbox public
             return avatar
 
         def loginFailed(result):
diff --git a/service/test/support/integration/app_test_client.py b/service/test/support/integration/app_test_client.py
index 892b73af..fa695708 100644
--- a/service/test/support/integration/app_test_client.py
+++ b/service/test/support/integration/app_test_client.py
@@ -222,7 +222,6 @@ class AppTestClient(object):
             provider = mock()
             self.resource.initialize(provider)
         else:
-            # TODO: write test for me (=
             self.service_factory = StubServicesFactory(self.accounts, mode)
             provider = mock()
             bonafide_checker = StubAuthenticator(provider)
@@ -307,7 +306,6 @@ class AppTestClient(object):
     def account_for(self, username):
         return self.accounts[username]
 
-    # TODO: remove
     def add_mail_to_user_inbox(self, input_mail, username):
         return self.account_for(username).mail_store.add_mail('INBOX', input_mail.raw)
 
@@ -336,10 +334,6 @@ class AppTestClient(object):
         mail_sender.sendmail.side_effect = lambda mail: succeed(mail)
         return mail_sender
 
-    # TODO: remove
-    def _generate_soledad_test_folder_name(self, soledad_test_folder='/tmp/soledad-test/test'):
-        return os.path.join(soledad_test_folder, str(uuid.uuid4()))
-
     def get_mails_by_tag(self, tag, page=1, window=100):
         tags = 'tag:%s' % tag
         return self.search(tags, page, window)
@@ -354,13 +348,6 @@ class AppTestClient(object):
         res = yield res
         defer.returnValue([ResponseMail(m) for m in res['mails']])
 
-    # TODO: remove
-    @defer.inlineCallbacks
-    def get_mails_by_mailbox_name(self, mbox_name):
-        mail_ids = yield self.mail_store.get_mailbox_mail_ids(mbox_name)
-        mails = yield self.mail_store.get_mails(mail_ids)
-        defer.returnValue(mails)
-
     @defer.inlineCallbacks
     def get_attachment(self, ident, encoding, filename=None, content_type=None, ajax=True, csrf='token'):
         params = {'encoding': [encoding]}
@@ -397,7 +384,6 @@ class AppTestClient(object):
         res, req = self.get('/mail/%s' % mail_ident)
         return res
 
-    # TODO: remove
     def delete_mail(self, mail_ident, session):
         csrf = IPixelatedSession(session).get_csrf_token()
         res, req = self.delete("/mail/%s" % mail_ident, csrf=csrf, session=session)
diff --git a/service/test/unit/resources/test_root_resource.py b/service/test/unit/resources/test_root_resource.py
index 4c9af052..1edba98c 100644
--- a/service/test/unit/resources/test_root_resource.py
+++ b/service/test/unit/resources/test_root_resource.py
@@ -329,7 +329,6 @@ class TestRootResource(unittest.TestCase):
         request.addCookie = MagicMock(return_value='stubbed')
         request.prepath = ['']
         request.path = '/'
-        # TODO: setup mocked portal
 
         resource = self.root_resource.getChildWithDefault(request.prepath[-1], request)
         self.assertIsInstance(resource, InboxResource)
@@ -339,7 +338,6 @@ class TestRootResource(unittest.TestCase):
         request.addCookie = MagicMock(return_value='stubbed')
         request.prepath = ['']
         request.path = '/'
-        # TODO: setup mocked portal
 
         resource = self.root_resource.getChildWithDefault(request.prepath[-1], request)
         self.assertIsInstance(resource, InboxResource)
-- 
cgit v1.2.3