From 6ac2e7a4c23ef2798ca5b4ad0aa84a5fb7b371f8 Mon Sep 17 00:00:00 2001 From: Duda Dornelles Date: Wed, 15 Oct 2014 16:03:17 +0200 Subject: moving things out of user_agent. now it is called runserver and only does basic app setup and delegates to other "classes". --- service/test/support/integration_helper.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'service/test/support/integration_helper.py') diff --git a/service/test/support/integration_helper.py b/service/test/support/integration_helper.py index 0d5d1125..8f2b8192 100644 --- a/service/test/support/integration_helper.py +++ b/service/test/support/integration_helper.py @@ -23,11 +23,13 @@ from pixelated.adapter.mail_service import MailService from pixelated.adapter.search import SearchEngine from pixelated.adapter.tag_service import TagService from pixelated.adapter.draft_service import DraftService -import pixelated.user_agent from pixelated.adapter.mail import PixelatedMail, InputMail +import pixelated.runserver from pixelated.adapter.pixelated_mailboxes import PixelatedMailBoxes from pixelated.adapter.soledad_querier import SoledadQuerier from pixelated.controllers import * +import pixelated.config.app_factory as app_factory + soledad_test_folder = "soledad-test" @@ -146,7 +148,7 @@ class SoledadTestBase: SearchEngine.INDEX_FOLDER = soledad_test_folder + '/search_index' - self.client = pixelated.user_agent.app.test_client() + self.client = pixelated.runserver.app.test_client() self._reset_routes(self.client.application) self.soledad_querier = SoledadQuerier(self.soledad) @@ -168,8 +170,8 @@ class SoledadTestBase: search_engine=self.search_engine) tags_controller = TagsController(search_engine=self.search_engine) - pixelated.user_agent._setup_routes(self.client.application, home_controller, mails_controller, tags_controller, - features_controller) + app_factory._setup_routes(self.client.application, home_controller, mails_controller, tags_controller, + features_controller) def get_mails_by_tag(self, tag): response = json.loads(self.client.get("/mails?q=tag:" + tag).data) -- cgit v1.2.3