moving to twisted

3 files changed, 11 insertions, 7 deletions

diff --git a/service/test/integration/drafts_test.py b/service/test/integration/drafts_test.py
index e0b49c13..5d2118df 100644
--- a/service/test/integration/drafts_test.py
+++ b/service/test/integration/drafts_test.py
@@ -27,17 +27,22 @@ class DraftsTest(unittest.TestCase, SoledadTestBase):
         self.teardown_soledad()
 
     def test_post_sends_mail_and_deletes_previous_draft_if_it_exists(self):
+        # creates one draft
         first_draft = MailBuilder().with_subject('First draft').build_json()
         first_draft_ident = self.put_mail(first_draft)
 
+        # sends an updated version of the draft
         second_draft = MailBuilder().with_subject('Second draft').with_ident(first_draft_ident).build_json()
         self.post_mail(second_draft)
 
         sent_mails = self.get_mails_by_tag('sent')
         drafts = self.get_mails_by_tag('drafts')
 
+        # make sure there is one email in the sent mailbox and it is the second draft
         self.assertEquals(1, len(sent_mails))
         self.assertEquals('Second draft', sent_mails[0].subject)
+
+        # make sure that there are no drafts in the draft mailbox
         self.assertEquals(0, len(drafts))
 
     def test_post_sends_mail_even_when_draft_does_not_exist(self):
diff --git a/service/test/integration/mark_as_read_unread_test.py b/service/test/integration/mark_as_read_unread_test.py
index 3bf56dd5..dc21c7b7 100644
--- a/service/test/integration/mark_as_read_unread_test.py
+++ b/service/test/integration/mark_as_read_unread_test.py
@@ -41,13 +41,12 @@ class MarkAsReadUnreadTest(unittest.TestCase, SoledadTestBase):
 
     def test_mark_single_as_unread(self):
         input_mail = MailBuilder().with_status([Status.SEEN]).build_input_mail()
-
         self.add_mail_to_inbox(input_mail)
 
         self.mark_as_unread(input_mail.ident)
+        mail = self.get_mails_by_tag('inbox')[0]
 
-        mails = self.get_mails_by_tag('inbox')
-        self.assertNotIn('read', mails[0].status)
+        self.assertNotIn('read', mail.status)
 
     def test_mark_many_mails_as_unread(self):
         input_mail = MailBuilder().with_status([Status.SEEN]).build_input_mail()
@@ -76,7 +75,7 @@ class MarkAsReadUnreadTest(unittest.TestCase, SoledadTestBase):
         self.assertNotIn('read', mails[1].status)
 
         response = self.mark_many_as_read([input_mail.ident, input_mail2.ident])
-        self.assertEquals(200, response.status_code)
+        self.assertEquals(200, response.code)
 
         mails = self.get_mails_by_tag('inbox')
 
@@ -98,7 +97,7 @@ class MarkAsReadUnreadTest(unittest.TestCase, SoledadTestBase):
         self.assertEquals(1, len(read_mails))
 
         response = self.mark_many_as_read([input_mail.ident, input_mail2.ident])
-        self.assertEquals(200, response.status_code)
+        self.assertEquals(200, response.code)
 
         mails = self.get_mails_by_tag('inbox')
 
diff --git a/service/test/integration/search_test.py b/service/test/integration/search_test.py
index 92c2f07e..649f7b96 100644
--- a/service/test/integration/search_test.py
+++ b/service/test/integration/search_test.py
@@ -43,7 +43,7 @@ class SearchTest(unittest.TestCase, SoledadTestBase):
         input_mail = MailBuilder().with_tags(['ateu', 'catoa', 'luat', 'zuado']).build_input_mail()
         self.add_mail_to_inbox(input_mail)
 
-        all_tags = self.get_tags('?q=at&skipDefaultTags=true')
+        all_tags = self.get_tags(q=["at"], skipDefaultTags=["true"])
 
         all_tag_names = [t['name'] for t in all_tags]
         self.assertEqual(3, len(all_tag_names))
@@ -55,7 +55,7 @@ class SearchTest(unittest.TestCase, SoledadTestBase):
         input_mail = MailBuilder().with_tags(['sometag']).build_input_mail()
         self.add_mail_to_inbox(input_mail)
 
-        all_tags = self.get_tags('?skipDefaultTags=true')
+        all_tags = self.get_tags(skipDefaultTags=["true"])
 
         all_tag_names = [t['name'] for t in all_tags]
         self.assertEqual(1, len(all_tag_names))