summaryrefslogtreecommitdiff
path: root/service/test/integration/test_delete_mail.py
diff options
context:
space:
mode:
authorRoald de Vries <rdevries@thoughtworks.com>2016-12-07 15:26:10 +0100
committerRoald de Vries <rdevries@thoughtworks.com>2016-12-07 15:26:10 +0100
commitd10f607a4d40587510b0dc31b31fe4750bf4a3a3 (patch)
treedb016bb0878989249e0f329e2162d11067b0f8b7 /service/test/integration/test_delete_mail.py
parentc28abba2f5b1186c671ebef508d40ffaae6d5bc5 (diff)
parenteaf2019b6e977d1191e0ee12f694a02bb9612f83 (diff)
[#801] Merge branch 'signup'
Diffstat (limited to 'service/test/integration/test_delete_mail.py')
-rw-r--r--service/test/integration/test_delete_mail.py13
1 files changed, 9 insertions, 4 deletions
diff --git a/service/test/integration/test_delete_mail.py b/service/test/integration/test_delete_mail.py
index a912f9f0..34ea5048 100644
--- a/service/test/integration/test_delete_mail.py
+++ b/service/test/integration/test_delete_mail.py
@@ -15,6 +15,7 @@
# along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
from twisted.internet import defer
from test.support.integration import SoledadTestBase, MailBuilder
+from pixelated.resources import IPixelatedSession
class DeleteMailTest(SoledadTestBase):
@@ -27,7 +28,8 @@ class DeleteMailTest(SoledadTestBase):
inbox_mails = yield self.app_test_client.get_mails_by_tag('inbox')
self.assertEquals(1, len(inbox_mails))
- yield self.app_test_client.delete_mail(mail.mail_id)
+ response, first_request = yield self.app_test_client.get('/', as_json=False)
+ yield self.app_test_client.delete_mail(mail.mail_id, session=first_request.getSession())
inbox_mails = yield self.app_test_client.get_mails_by_tag('inbox')
self.assertEquals(0, len(inbox_mails))
@@ -37,7 +39,8 @@ class DeleteMailTest(SoledadTestBase):
@defer.inlineCallbacks
def test_delete_mail_when_trashing_mail_from_trash_mailbox(self):
mails = yield self.app_test_client.add_multiple_to_mailbox(1, 'trash')
- yield self.app_test_client.delete_mails([mails[0].ident])
+ response, first_request = yield self.app_test_client.get('/', as_json=False)
+ yield self.app_test_client.delete_mails([mails[0].ident], session=first_request.getSession())
trash_mails = yield self.app_test_client.get_mails_by_tag('trash')
@@ -49,7 +52,8 @@ class DeleteMailTest(SoledadTestBase):
mails = yield self.app_test_client.add_multiple_to_mailbox(5, 'inbox')
mail_idents = [m.ident for m in mails]
- yield self.app_test_client.delete_mails(mail_idents)
+ response, first_request = yield self.app_test_client.get('/', as_json=False)
+ yield self.app_test_client.delete_mails(mail_idents, session=first_request.getSession())
inbox = yield self.app_test_client.get_mails_by_tag('inbox')
self.assertEquals(0, len(inbox))
@@ -59,7 +63,8 @@ class DeleteMailTest(SoledadTestBase):
mails = yield self.app_test_client.add_multiple_to_mailbox(5, 'trash')
mail_idents = [m.ident for m in mails]
- yield self.app_test_client.delete_mails(mail_idents)
+ response, first_request = yield self.app_test_client.get('/', as_json=False)
+ yield self.app_test_client.delete_mails(mail_idents, session=first_request.getSession())
trash = yield self.app_test_client.get_mails_by_tag('trash')
self.assertEquals(0, len(trash))