From 99d540becb364a46553e0b3e8a6a8933947bd699 Mon Sep 17 00:00:00 2001
From: Duda Dornelles <ddornell@thoughtworks.com>
Date: Mon, 29 Sep 2014 16:19:55 -0300
Subject: moving base soledad test setup to its own class

---
 service/integration/mail_fetch_test.py | 40 ++++------------------------------
 1 file changed, 4 insertions(+), 36 deletions(-)

(limited to 'service/integration/mail_fetch_test.py')

diff --git a/service/integration/mail_fetch_test.py b/service/integration/mail_fetch_test.py
index 0b66fe1d..882e9d6f 100644
--- a/service/integration/mail_fetch_test.py
+++ b/service/integration/mail_fetch_test.py
@@ -1,47 +1,15 @@
 import unittest
 
-from flask import json
-from mockito import mock
-from pixelated.adapter.mail_service import MailService
-from pixelated.adapter.pixelated_mail import PixelatedMail
-from pixelated.adapter.pixelated_mailboxes import PixelatedMailBoxes
-from pixelated.adapter.soledad_querier import SoledadQuerier
-import pixelated.user_agent
-from integration import JSONMailBuilder, initialize_soledad
+from integration import JSONMailBuilder, SoledadTestBase
 
 
-class FakeAccount(object):
-    def __init__(self):
-        self.mailboxes = ['INBOX', 'DRAFTS', 'SENT', 'TRASH']
-
-
-class MailFetchTest(unittest.TestCase):
+class MailFetchTest(unittest.TestCase, SoledadTestBase):
 
     def setUp(self):
-        self.soledad_test_folder = "soledad-test"
-        self.app = pixelated.user_agent.app.test_client()
-        self.account = FakeAccount()
-        self.mail_sender = mock()
-        self.mail_address = "test@pixelated.org"
-        self.soledad = initialize_soledad(tempdir=self.soledad_test_folder)
-
-        SoledadQuerier.instance = None
-        SoledadQuerier.get_instance(soledad=self.soledad)
-        PixelatedMail.from_email_address = self.mail_address
-        pixelated_mailboxes = PixelatedMailBoxes(self.account)
-        pixelated.user_agent.mail_service = MailService(pixelated_mailboxes, self.mail_sender)
-        pixelated.user_agent.DISABLED_FEATURES = []
+        self.setup_soledad()
 
     def tearDown(self):
-        self.soledad.close()
-        import shutil
-        shutil.rmtree(self.soledad_test_folder)
-
-    def get_mails_by_tag(self, tag):
-        return json.loads(self.app.get("/mails?q=tag" + tag).data)
-
-    def post_mail(self, data):
-        self.app.post('/mails', data=data, content_type="application/json")
+        self.teardown_soledad()
 
     def test_get_mails(self):
         mail_one = JSONMailBuilder().with_subject("Mail One").build()
-- 
cgit v1.2.3