diff options
Diffstat (limited to 'service/test/support/integration')
| -rw-r--r-- | service/test/support/integration/app_test_client.py | 67 | ||||
| -rw-r--r-- | service/test/support/integration/multi_user_client.py | 29 |
2 files changed, 47 insertions, 49 deletions
diff --git a/service/test/support/integration/app_test_client.py b/service/test/support/integration/app_test_client.py index fa695708..d52c85c0 100644 --- a/service/test/support/integration/app_test_client.py +++ b/service/test/support/integration/app_test_client.py @@ -38,7 +38,7 @@ from leap.soledad.client import Soledad from leap.bitmask.mail.adaptors.soledad import SoledadMailAdaptor from pixelated.adapter.mailstore.leap_attachment_store import LeapAttachmentStore from pixelated.adapter.services.feedback_service import FeedbackService -from pixelated.application import UserAgentMode, set_up_protected_resources, get_static_folder +from pixelated.application import UserAgentMode, set_up_protected_resources from pixelated.config.sessions import LeapSession from pixelated.config.services import Services, ServicesFactory, SingleUserServicesFactory from pixelated.config.site import PixelatedSite @@ -49,7 +49,6 @@ from pixelated.adapter.search import SearchEngine from pixelated.adapter.services.draft_service import DraftService from pixelated.adapter.services.mail_service import MailService from pixelated.resources.root_resource import RootResource -from pixelated.resources.session import IPixelatedSession from test.support.integration.model import MailBuilder from test.support.test_helper import request_mock from test.support.integration.model import ResponseMail @@ -218,7 +217,7 @@ class AppTestClient(object): services = self._test_account.services self.service_factory.add_session('someuserid', services) - self.resource = RootResource(self.service_factory, get_static_folder()) + self.resource = RootResource(self.service_factory) provider = mock() self.resource.initialize(provider) else: @@ -227,7 +226,7 @@ class AppTestClient(object): bonafide_checker = StubAuthenticator(provider) bonafide_checker.add_user('username', 'password') - self.resource = set_up_protected_resources(RootResource(self.service_factory, get_static_folder()), provider, self.service_factory, authenticator=bonafide_checker) + self.resource = set_up_protected_resources(RootResource(self.service_factory), provider, self.service_factory, authenticator=bonafide_checker) @defer.inlineCallbacks def create_user(self, account_name): @@ -279,23 +278,17 @@ class AppTestClient(object): request.args = get_args return self._render(request, as_json) - def post(self, path, body='', headers=None, ajax=True, csrf='token', session=None): + def post(self, path, body='', headers=None, ajax=True, csrf='token'): headers = headers or {'Content-Type': 'application/json'} request = request_mock(path=path, method="POST", body=body, headers=headers, ajax=ajax, csrf=csrf) - if session: - request.session = session return self._render(request) - def put(self, path, body, ajax=True, csrf='token', session=None): + def put(self, path, body, ajax=True, csrf='token'): request = request_mock(path=path, method="PUT", body=body, headers={'Content-Type': ['application/json']}, ajax=ajax, csrf=csrf) - if session: - request.session = session return self._render(request) - def delete(self, path, body="", ajax=True, csrf='token', session=None): + def delete(self, path, body="", ajax=True, csrf='token'): request = request_mock(path=path, body=body, headers={'Content-Type': ['application/json']}, method="DELETE", ajax=ajax, csrf=csrf) - if session: - request.session = session return self._render(request) @defer.inlineCallbacks @@ -306,6 +299,7 @@ class AppTestClient(object): def account_for(self, username): return self.accounts[username] + # TODO: remove def add_mail_to_user_inbox(self, input_mail, username): return self.account_for(username).mail_store.add_mail('INBOX', input_mail.raw) @@ -334,6 +328,10 @@ class AppTestClient(object): mail_sender.sendmail.side_effect = lambda mail: succeed(mail) return mail_sender + # TODO: remove + def _generate_soledad_test_folder_name(self, soledad_test_folder='/tmp/soledad-test/test'): + return os.path.join(soledad_test_folder, str(uuid.uuid4())) + def get_mails_by_tag(self, tag, page=1, window=100): tags = 'tag:%s' % tag return self.search(tags, page, window) @@ -348,6 +346,13 @@ class AppTestClient(object): res = yield res defer.returnValue([ResponseMail(m) for m in res['mails']]) + # TODO: remove + @defer.inlineCallbacks + def get_mails_by_mailbox_name(self, mbox_name): + mail_ids = yield self.mail_store.get_mailbox_mail_ids(mbox_name) + mails = yield self.mail_store.get_mails(mail_ids) + defer.returnValue(mails) + @defer.inlineCallbacks def get_attachment(self, ident, encoding, filename=None, content_type=None, ajax=True, csrf='token'): params = {'encoding': [encoding]} @@ -360,20 +365,17 @@ class AppTestClient(object): defer.returnValue((res, req)) @defer.inlineCallbacks - def post_attachment(self, data, headers, session): - csrf = IPixelatedSession(session).get_csrf_token() - deferred_result, req = self.post('/attachment', body=data, headers=headers, csrf=csrf, session=session) + def post_attachment(self, data, headers): + deferred_result, req = self.post('/attachment', body=data, headers=headers) res = yield deferred_result defer.returnValue((res, req)) - def put_mail(self, data, session): - csrf = IPixelatedSession(session).get_csrf_token() - res, req = self.put('/mails', data, csrf=csrf, session=session) + def put_mail(self, data): + res, req = self.put('/mails', data) return res, req - def post_tags(self, mail_ident, tags_json, session): - csrf = IPixelatedSession(session).get_csrf_token() - res, req = self.post("/mail/%s/tags" % mail_ident, tags_json, csrf=csrf, session=session) + def post_tags(self, mail_ident, tags_json): + res, req = self.post("/mail/%s/tags" % mail_ident, tags_json) return res def get_tags(self, **kwargs): @@ -384,24 +386,21 @@ class AppTestClient(object): res, req = self.get('/mail/%s' % mail_ident) return res - def delete_mail(self, mail_ident, session): - csrf = IPixelatedSession(session).get_csrf_token() - res, req = self.delete("/mail/%s" % mail_ident, csrf=csrf, session=session) + # TODO: remove + def delete_mail(self, mail_ident): + res, req = self.delete("/mail/%s" % mail_ident) return res - def delete_mails(self, idents, session): - csrf = IPixelatedSession(session).get_csrf_token() - res, req = self.post("/mails/delete", json.dumps({'idents': idents}), csrf=csrf, session=session) + def delete_mails(self, idents): + res, req = self.post("/mails/delete", json.dumps({'idents': idents})) return res - def mark_many_as_unread(self, idents, session): - csrf = IPixelatedSession(session).get_csrf_token() - res, req = self.post('/mails/unread', json.dumps({'idents': idents}), csrf=csrf, session=session) + def mark_many_as_unread(self, idents): + res, req = self.post('/mails/unread', json.dumps({'idents': idents})) return res - def mark_many_as_read(self, idents, session): - csrf = IPixelatedSession(session).get_csrf_token() - res, req = self.post('/mails/read', json.dumps({'idents': idents}), csrf=csrf, session=session) + def mark_many_as_read(self, idents): + res, req = self.post('/mails/read', json.dumps({'idents': idents})) return res def get_contacts(self, query): diff --git a/service/test/support/integration/multi_user_client.py b/service/test/support/integration/multi_user_client.py index de272e16..82acb210 100644 --- a/service/test/support/integration/multi_user_client.py +++ b/service/test/support/integration/multi_user_client.py @@ -19,12 +19,11 @@ from mockito import mock, when, any as ANY from pixelated.authentication import Authenticator, Authentication from twisted.internet import defer -from pixelated.application import UserAgentMode, set_up_protected_resources, get_static_folder +from pixelated.application import UserAgentMode, set_up_protected_resources from pixelated.config.services import ServicesFactory from pixelated.config.sessions import LeapSessionFactory import pixelated.config.services -from pixelated.resources import IPixelatedSession from pixelated.resources.root_resource import RootResource from test.support.integration import AppTestClient from test.support.integration.app_test_client import AppTestAccount, StubSRPChecker @@ -46,7 +45,7 @@ class MultiUserClient(AppTestClient): self.service_factory = ServicesFactory(UserAgentMode(is_single_user=False)) - root_resource = RootResource(self.service_factory, get_static_folder()) + root_resource = RootResource(self.service_factory) leap_provider = mock() self.credentials_checker = StubSRPChecker(leap_provider) self.resource = set_up_protected_resources(root_resource, leap_provider, self.service_factory) @@ -58,41 +57,41 @@ class MultiUserClient(AppTestClient): else: when(Authenticator)._bonafide_auth(username, password).thenRaise(SRPAuthError) - def login(self, username='username', password='password', session=None): - auth_session = Authentication(username, 'some_user_token', 'some_user_uuid', 'session_id', {'is_admin': False}) + def login(self, username='username', password='password'): + session = Authentication(username, 'some_user_token', 'some_user_uuid', 'session_id', {'is_admin': False}) leap_session = self._test_account.leap_session - leap_session.user_auth = auth_session + leap_session.user_auth = session config = mock() config.leap_home = 'some_folder' leap_session.config = config leap_session.fresh_account = False self.leap_session = leap_session self.services = self._test_account.services - self.user_auth = auth_session + self.user_auth = session self._mock_bonafide_auth(username, password) - when(LeapSessionFactory).create(username, password, auth_session).thenReturn(leap_session) + when(LeapSessionFactory).create(username, password, session).thenReturn(leap_session) with patch('mockito.invocation.AnswerSelector', AnswerSelector): when(leap_session).initial_sync().thenAnswer(lambda: defer.succeed(None)) when(pixelated.config.services).Services(ANY()).thenReturn(self.services) - csrftoken = IPixelatedSession(session).get_csrf_token() - request = request_mock(path='/login', method="POST", body={'username': username, 'password': password, 'csrftoken': csrftoken}, ajax=False) - request.session = session + request = request_mock(path='/login', method="POST", body={'username': username, 'password': password}) return self._render(request, as_json=False) - def get(self, path, get_args='', as_json=True, session=None): + def get(self, path, get_args='', as_json=True, from_request=None): request = request_mock(path) request.args = get_args - if session: + if from_request: + session = from_request.getSession() request.session = session return self._render(request, as_json) - def post(self, path, body='', headers=None, ajax=True, csrf='token', as_json=True, session=None): + def post(self, path, body='', headers=None, ajax=True, csrf='token', as_json=True, from_request=None): headers = headers or {'Content-Type': 'application/json'} request = request_mock(path=path, method="POST", body=body, headers=headers, ajax=ajax, csrf=csrf) - if session: + if from_request: + session = from_request.getSession() request.session = session return self._render(request, as_json) |