diff options
Diffstat (limited to 'service/test/integration/test_drafts.py')
| -rw-r--r-- | service/test/integration/test_drafts.py | 30 |
1 files changed, 8 insertions, 22 deletions
diff --git a/service/test/integration/test_drafts.py b/service/test/integration/test_drafts.py index a9c7b3f7..657cfab1 100644 --- a/service/test/integration/test_drafts.py +++ b/service/test/integration/test_drafts.py @@ -17,7 +17,6 @@ from test.support.integration import SoledadTestBase, MailBuilder from mockito import unstub, when, any from twisted.internet import defer -from pixelated.resources import IPixelatedSession class DraftsTest(SoledadTestBase): @@ -27,20 +26,17 @@ class DraftsTest(SoledadTestBase): @defer.inlineCallbacks def test_post_sends_mail_and_deletes_previous_draft_if_it_exists(self): - response, first_request = yield self.app_test_client.get('/', as_json=False) - session = first_request.getSession() - # act as if sending the mail by SMTP succeeded sendmail_deferred = defer.Deferred() when(self.app_test_client.mail_sender).sendmail(any()).thenReturn(sendmail_deferred) # creates one draft first_draft = MailBuilder().with_subject('First draft').build_json() - first_draft_ident = (yield self.app_test_client.put_mail(first_draft, session=session)[0])['ident'] + first_draft_ident = (yield self.app_test_client.put_mail(first_draft)[0])['ident'] # sends an updated version of the draft second_draft = MailBuilder().with_subject('Second draft').with_ident(first_draft_ident).build_json() - deferred_res = self.post_mail(second_draft, session) + deferred_res = self.post_mail(second_draft) sendmail_deferred.callback(None) # SMTP succeeded @@ -58,15 +54,12 @@ class DraftsTest(SoledadTestBase): @defer.inlineCallbacks def test_post_sends_mail_even_when_draft_does_not_exist(self): - response, first_request = yield self.app_test_client.get('/', as_json=False) - session = first_request.getSession() - # act as if sending the mail by SMTP succeeded sendmail_deferred = defer.Deferred() when(self.app_test_client.mail_sender).sendmail(any()).thenReturn(sendmail_deferred) first_draft = MailBuilder().with_subject('First draft').build_json() - res = self.post_mail(first_draft, session) + res = self.post_mail(first_draft) sendmail_deferred.callback(True) yield res @@ -77,32 +70,25 @@ class DraftsTest(SoledadTestBase): self.assertEquals('First draft', sent_mails[0].subject) self.assertEquals(0, len(drafts)) - def post_mail(self, data, session): - csrf = IPixelatedSession(session).get_csrf_token() - deferred_res, req = self.app_test_client.post('/mails', data, csrf=csrf, session=session) + def post_mail(self, data): + deferred_res, req = self.app_test_client.post('/mails', data) return deferred_res @defer.inlineCallbacks def test_put_creates_a_draft_if_it_does_not_exist(self): - response, first_request = yield self.app_test_client.get('/', as_json=False) - session = first_request.getSession() - mail = MailBuilder().with_subject('A new draft').build_json() - yield self.app_test_client.put_mail(mail, session=session)[0] + yield self.app_test_client.put_mail(mail)[0] mails = yield self.app_test_client.get_mails_by_tag('drafts') self.assertEquals('A new draft', mails[0].subject) @defer.inlineCallbacks def test_put_updates_draft_if_it_already_exists(self): - response, first_request = yield self.app_test_client.get('/', as_json=False) - session = first_request.getSession() - draft = MailBuilder().with_subject('First draft').build_json() - draft_ident = (yield self.app_test_client.put_mail(draft, session=session)[0])['ident'] + draft_ident = (yield self.app_test_client.put_mail(draft)[0])['ident'] updated_draft = MailBuilder().with_subject('First draft edited').with_ident(draft_ident).build_json() - yield self.app_test_client.put_mail(updated_draft, session=session)[0] + yield self.app_test_client.put_mail(updated_draft)[0] drafts = yield self.app_test_client.get_mails_by_tag('drafts') |