summaryrefslogtreecommitdiff
path: root/service/test/integration
diff options
context:
space:
mode:
authorFolker Bernitt <fbernitt@thoughtworks.com>2014-10-08 18:06:28 +0200
committerFolker Bernitt <fbernitt@thoughtworks.com>2014-10-09 18:24:41 +0200
commit85264c9ab3052dd844016d3ec44cb8af43dd5869 (patch)
treed6a5cb6511039407fdef40804c5338347b71c551 /service/test/integration
parentfb8782d3f66b1068153a9948a01864ee52e39b10 (diff)
Added whoosh as search engine (issue #94).
Diffstat (limited to 'service/test/integration')
-rw-r--r--service/test/integration/delete_mail_test.py6
-rw-r--r--service/test/integration/mark_as_read_test.py2
-rw-r--r--service/test/integration/tags_test.py4
3 files changed, 6 insertions, 6 deletions
diff --git a/service/test/integration/delete_mail_test.py b/service/test/integration/delete_mail_test.py
index 3d4a6af7..665c7793 100644
--- a/service/test/integration/delete_mail_test.py
+++ b/service/test/integration/delete_mail_test.py
@@ -26,13 +26,13 @@ class DeleteMailTest(unittest.TestCase, SoledadTestBase):
self.teardown_soledad()
def test_move_mail_to_trash_when_deleting(self):
- mail = MailBuilder().with_subject('Mail with tags').build_input_mail()
- self.pixelated_mailboxes.inbox().add(mail)
+ input_mail = MailBuilder().with_subject('Mail with tags').build_input_mail()
+ self.add_mail_to_inbox(input_mail)
inbox_mails = self.get_mails_by_tag('inbox')
self.assertEquals(1, len(inbox_mails))
- self.delete_mail(mail.ident)
+ self.delete_mail(input_mail.ident)
inbox_mails = self.get_mails_by_tag('inbox')
self.assertEquals(0, len(inbox_mails))
diff --git a/service/test/integration/mark_as_read_test.py b/service/test/integration/mark_as_read_test.py
index 2c95ebc1..5dd90d77 100644
--- a/service/test/integration/mark_as_read_test.py
+++ b/service/test/integration/mark_as_read_test.py
@@ -27,7 +27,7 @@ class MarkAsReadTest(unittest.TestCase, SoledadTestBase):
def test_mark_as_read(self):
input_mail = MailBuilder().build_input_mail()
- self.pixelated_mailboxes.inbox().add(input_mail)
+ self.add_mail_to_inbox(input_mail)
mails = self.get_mails_by_tag('inbox')
self.assertFalse('read' in mails[0].status)
diff --git a/service/test/integration/tags_test.py b/service/test/integration/tags_test.py
index e2ef1c0e..dea9fbd2 100644
--- a/service/test/integration/tags_test.py
+++ b/service/test/integration/tags_test.py
@@ -31,7 +31,7 @@ class TagsTest(unittest.TestCase, SoledadTestBase):
def test_add_tag_to_an_inbox_mail_and_query(self):
mail = MailBuilder().with_subject('Mail with tags').build_input_mail()
- self.pixelated_mailboxes.inbox().add(mail)
+ self.add_mail_to_inbox(mail)
self.post_tags(mail.ident, self._tags_json(['IMPORTANT']))
@@ -43,7 +43,7 @@ class TagsTest(unittest.TestCase, SoledadTestBase):
def test_addition_of_reserved_tags_is_not_allowed(self):
mail = MailBuilder().with_subject('Mail with tags').build_input_mail()
- self.pixelated_mailboxes.inbox().add(mail)
+ self.add_mail_to_inbox(mail)
response = self.post_tags(mail.ident, self._tags_json(['DRAFTS']))
self.assertEquals("None of the following words can be used as tags: drafts", response)