diff options
| author | Roald de Vries <rdevries@thoughtworks.com> | 2016-10-06 17:03:44 -0300 |
|---|---|---|
| committer | Roald de Vries <rdevries@thoughtworks.com> | 2016-10-07 18:25:02 -0300 |
| commit | f4d7541c9b6dcf67b57b13f7ca7434ec68eeb59c (patch) | |
| tree | 8d50a54a9a8d5dd451253e55275f209f9df32b0a /service/test/integration/test_mark_as_read_unread.py | |
| parent | 4642cee939c08bfa809f55b6a85ffa773600eaf9 (diff) | |
use test client in test case through composition instead of inheritance
Diffstat (limited to 'service/test/integration/test_mark_as_read_unread.py')
| -rw-r--r-- | service/test/integration/test_mark_as_read_unread.py | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/service/test/integration/test_mark_as_read_unread.py b/service/test/integration/test_mark_as_read_unread.py index 48879e4a..18c3ddc2 100644 --- a/service/test/integration/test_mark_as_read_unread.py +++ b/service/test/integration/test_mark_as_read_unread.py @@ -25,24 +25,24 @@ class MarkAsReadUnreadTest(SoledadTestBase): @defer.inlineCallbacks def test_mark_single_as_read(self): input_mail = MailBuilder().build_input_mail() - mail = yield self.add_mail_to_inbox(input_mail) + mail = yield self.app_test_client.add_mail_to_inbox(input_mail) - mails = yield self.get_mails_by_tag('inbox') + mails = yield self.app_test_client.get_mails_by_tag('inbox') self.assertNotIn('read', mails[0].status) - yield self.mark_many_as_read([mail.ident]) + yield self.app_test_client.mark_many_as_read([mail.ident]) - mails = yield self.get_mails_by_tag('inbox') + mails = yield self.app_test_client.get_mails_by_tag('inbox') self.assertIn('read', mails[0].status) @defer.inlineCallbacks def test_mark_single_as_unread(self): input_mail = MailBuilder().build_input_mail() - mail = yield self.add_mail_to_inbox(input_mail) - yield self.mark_many_as_read([mail.ident]) + mail = yield self.app_test_client.add_mail_to_inbox(input_mail) + yield self.app_test_client.mark_many_as_read([mail.ident]) - yield self.mark_many_as_unread([mail.ident]) - result = (yield self.get_mails_by_tag('inbox'))[0] + yield self.app_test_client.mark_many_as_unread([mail.ident]) + result = (yield self.app_test_client.get_mails_by_tag('inbox'))[0] self.assertNotIn('read', result.status) @@ -51,13 +51,13 @@ class MarkAsReadUnreadTest(SoledadTestBase): input_mail = MailBuilder().with_status([Status.SEEN]).build_input_mail() input_mail2 = MailBuilder().with_status([Status.SEEN]).build_input_mail() - mail1 = yield self.add_mail_to_inbox(input_mail) - mail2 = yield self.add_mail_to_inbox(input_mail2) - yield self.mark_many_as_read([mail1.ident, mail2.ident]) + mail1 = yield self.app_test_client.add_mail_to_inbox(input_mail) + mail2 = yield self.app_test_client.add_mail_to_inbox(input_mail2) + yield self.app_test_client.mark_many_as_read([mail1.ident, mail2.ident]) - yield self.mark_many_as_unread([mail1.ident, mail2.ident]) + yield self.app_test_client.mark_many_as_unread([mail1.ident, mail2.ident]) - mails = yield self.get_mails_by_tag('inbox') + mails = yield self.app_test_client.get_mails_by_tag('inbox') self.assertNotIn('read', mails[0].status) self.assertNotIn('read', mails[1].status) @@ -67,17 +67,17 @@ class MarkAsReadUnreadTest(SoledadTestBase): input_mail = MailBuilder().build_input_mail() input_mail2 = MailBuilder().build_input_mail() - yield self.add_mail_to_inbox(input_mail) - yield self.add_mail_to_inbox(input_mail2) + yield self.app_test_client.add_mail_to_inbox(input_mail) + yield self.app_test_client.add_mail_to_inbox(input_mail2) - mails = yield self.get_mails_by_tag('inbox') + mails = yield self.app_test_client.get_mails_by_tag('inbox') self.assertNotIn('read', mails[0].status) self.assertNotIn('read', mails[1].status) - yield self.mark_many_as_read([mails[0].ident, mails[1].ident]) + yield self.app_test_client.mark_many_as_read([mails[0].ident, mails[1].ident]) - mails = yield self.get_mails_by_tag('inbox') + mails = yield self.app_test_client.get_mails_by_tag('inbox') self.assertIn('read', mails[0].status) self.assertIn('read', mails[1].status) @@ -87,20 +87,20 @@ class MarkAsReadUnreadTest(SoledadTestBase): input_mail = MailBuilder().with_subject('first').build_input_mail() input_mail2 = MailBuilder().with_subject('second').build_input_mail() - yield self.add_mail_to_inbox(input_mail) - mail2 = yield self.add_mail_to_inbox(input_mail2) - yield self.mark_many_as_read([mail2.ident]) + yield self.app_test_client.add_mail_to_inbox(input_mail) + mail2 = yield self.app_test_client.add_mail_to_inbox(input_mail2) + yield self.app_test_client.mark_many_as_read([mail2.ident]) - mails = yield self.get_mails_by_tag('inbox') + mails = yield self.app_test_client.get_mails_by_tag('inbox') read_mails = filter(lambda x: 'read' in x.status, mails) unread_mails = filter(lambda x: 'read' not in x.status, mails) self.assertEquals(1, len(unread_mails)) self.assertEquals(1, len(read_mails)) - yield self.mark_many_as_read([mails[0].ident, mails[1].ident]) + yield self.app_test_client.mark_many_as_read([mails[0].ident, mails[1].ident]) - mails = yield self.get_mails_by_tag('inbox') + mails = yield self.app_test_client.get_mails_by_tag('inbox') self.assertIn('read', mails[0].status) self.assertIn('read', mails[1].status) |