From cbcc049737e26e30db8890e31d6b98725bdb3385 Mon Sep 17 00:00:00 2001 From: Victor Shyba Date: Sat, 10 Jun 2017 06:19:03 -0300 Subject: [feature] add formatting from MX into incoming Use the same formatting as MX was using for backwards compatibility. -- Resolves: #8828 --- testing/tests/server/test_incoming_resource.py | 12 ++++++++---- testing/tests/server/test_incoming_server.py | 10 +++++++--- 2 files changed, 15 insertions(+), 7 deletions(-) (limited to 'testing/tests/server') diff --git a/testing/tests/server/test_incoming_resource.py b/testing/tests/server/test_incoming_resource.py index ccec2198..81925580 100644 --- a/testing/tests/server/test_incoming_resource.py +++ b/testing/tests/server/test_incoming_resource.py @@ -20,6 +20,8 @@ Unit tests for incoming API resource from twisted.trial import unittest from twisted.web.test.test_web import DummyRequest from leap.soledad.server._incoming import IncomingResource +from leap.soledad.server._incoming import IncomingFormatter +from leap.soledad.common.crypto import EncryptionSchemes from io import BytesIO from uuid import uuid4 from mock import Mock @@ -35,9 +37,11 @@ class BlobServerTestCase(unittest.TestCase): self.user_uuid = uuid4().hex def test_save_document(self): - doc_id = uuid4().hex - request = DummyRequest([self.user_uuid, doc_id]) - request.content = BytesIO('{}') + formatter = IncomingFormatter() + doc_id, scheme = uuid4().hex, EncryptionSchemes.NONE + content = 'Incoming content' + request = DummyRequest([self.user_uuid, doc_id, scheme]) + request.content = BytesIO(content) self.resource.render_PUT(request) open_database = self.backend_factory.open_database @@ -45,4 +49,4 @@ class BlobServerTestCase(unittest.TestCase): self.couchdb.put_doc.assert_called_once() doc = self.couchdb.put_doc.call_args[0][0] self.assertEquals(doc_id, doc.doc_id) - self.assertEquals('{}', doc.get_json()) + self.assertEquals(formatter.format(content, scheme), doc.content) diff --git a/testing/tests/server/test_incoming_server.py b/testing/tests/server/test_incoming_server.py index 6e05206a..d0410520 100644 --- a/testing/tests/server/test_incoming_server.py +++ b/testing/tests/server/test_incoming_server.py @@ -26,6 +26,8 @@ from twisted.internet import defer import treq from leap.soledad.server._incoming import IncomingResource +from leap.soledad.server._incoming import IncomingFormatter +from leap.soledad.common.crypto import EncryptionSchemes from test_soledad.util import CouchServerStateForTests from test_soledad.util import CouchDBTestCase @@ -49,9 +51,11 @@ class BlobServerTestCase(CouchDBTestCase): @pytest.mark.usefixtures("method_tmpdir") def test_put_incoming_creates_a_document(self): user_id, doc_id = self.user_id, uuid4().hex - incoming_endpoint = self.uri + '%s/%s' % (user_id, doc_id) - yield treq.put(incoming_endpoint, BytesIO('{}'), persistent=False) + content, scheme = 'Hi', EncryptionSchemes.NONE + formatter = IncomingFormatter() + incoming_endpoint = self.uri + '%s/%s/%s' % (user_id, doc_id, scheme) + yield treq.put(incoming_endpoint, BytesIO(content), persistent=False) db = self.state.open_database(user_id) doc = db.get_doc(doc_id) - self.assertEquals(doc.content, {}) + self.assertEquals(doc.content, formatter.format(content, scheme)) -- cgit v1.2.3