summaryrefslogtreecommitdiff
path: root/service/test/integration/test_contacts.py
diff options
context:
space:
mode:
authorVictor Shyba <victor.shyba@gmail.com>2015-03-18 16:58:54 -0300
committerVictor Shyba <victor.shyba@gmail.com>2015-03-18 16:59:33 -0300
commitbdba0f2fce00d53d445371be3c09cda01274d0e8 (patch)
tree3b1152f31bbab0274901fccc0372283300deab24 /service/test/integration/test_contacts.py
parent0dbd662b5bdc372f2148f72c86412e0555eac1dc (diff)
no more self.client, since those methods are available from test case base
Diffstat (limited to 'service/test/integration/test_contacts.py')
-rw-r--r--service/test/integration/test_contacts.py24
1 files changed, 12 insertions, 12 deletions
diff --git a/service/test/integration/test_contacts.py b/service/test/integration/test_contacts.py
index 3a510346..f9cde9e5 100644
--- a/service/test/integration/test_contacts.py
+++ b/service/test/integration/test_contacts.py
@@ -22,7 +22,7 @@ class ContactsTest(SoledadTestBase):
def test_TO_CC_and_BCC_fields_are_being_searched(self):
input_mail = MailBuilder().with_tags(['important']).build_input_mail()
- self.client.add_mail_to_inbox(input_mail)
+ self.add_mail_to_inbox(input_mail)
d = self.get_contacts(query='recipient')
@@ -35,7 +35,7 @@ class ContactsTest(SoledadTestBase):
def test_FROM_address_is_being_searched(self):
input_mail = MailBuilder().with_tags(['important']).build_input_mail()
- self.client.add_mail_to_inbox(input_mail)
+ self.add_mail_to_inbox(input_mail)
d = self.get_contacts(query='Sender')
@@ -45,10 +45,10 @@ class ContactsTest(SoledadTestBase):
return d
def test_trash_and_drafts_mailboxes_are_being_ignored(self):
- self.client.add_multiple_to_mailbox(1, mailbox='INBOX', to='recipient@inbox.com')
- self.client.add_multiple_to_mailbox(1, mailbox='DRAFTS', to='recipient@drafts.com')
- self.client.add_multiple_to_mailbox(1, mailbox='SENT', to='recipient@sent.com')
- self.client.add_multiple_to_mailbox(1, mailbox='TRASH', to='recipient@trash.com')
+ self.add_multiple_to_mailbox(1, mailbox='INBOX', to='recipient@inbox.com')
+ self.add_multiple_to_mailbox(1, mailbox='DRAFTS', to='recipient@drafts.com')
+ self.add_multiple_to_mailbox(1, mailbox='SENT', to='recipient@sent.com')
+ self.add_multiple_to_mailbox(1, mailbox='TRASH', to='recipient@trash.com')
d = self.get_contacts(query='recipient')
@@ -69,8 +69,8 @@ class ContactsTest(SoledadTestBase):
formatted_input_mail.with_bcc('Recipient Carbon <recipient@bcc.com>')
formatted_input_mail = formatted_input_mail.build_input_mail()
- self.client.add_mail_to_inbox(input_mail)
- self.client.add_mail_to_inbox(formatted_input_mail)
+ self.add_mail_to_inbox(input_mail)
+ self.add_mail_to_inbox(formatted_input_mail)
d = self.get_contacts(query='Recipient')
@@ -84,17 +84,17 @@ class ContactsTest(SoledadTestBase):
def test_bounced_addresses_are_ignored(self):
to_be_bounced = MailBuilder().with_to('this_mail_was_bounced@domain.com').build_input_mail()
- self.client.add_mail_to_inbox(to_be_bounced)
+ self.add_mail_to_inbox(to_be_bounced)
bounced_mail_template = MailBuilder().build_input_mail()
- bounced_mail = self.client.mailboxes.inbox().add(bounced_mail_template)
+ bounced_mail = self.mailboxes.inbox().add(bounced_mail_template)
bounced_mail.hdoc.content = self._bounced_mail_hdoc_content()
bounced_mail.save()
- self.client.search_engine.index_mail(bounced_mail)
+ self.search_engine.index_mail(bounced_mail)
not_bounced_mail = MailBuilder(
).with_tags(['important']).with_to('this_mail_was_not@bounced.com').build_input_mail()
- self.client.add_mail_to_inbox(not_bounced_mail)
+ self.add_mail_to_inbox(not_bounced_mail)
d = self.get_contacts(query='this')