summaryrefslogtreecommitdiff
path: root/service/test
diff options
context:
space:
mode:
authorDuda Dornelles <dudassdornelles@gmail.com>2015-01-21 18:12:25 -0200
committerPixpoa pairing <pixpoapairing@pixelated-project.org>2015-01-21 18:12:25 -0200
commit8abb94a88e40fde249b562a841a5b0398582717e (patch)
treec2cc4c7a00e80fb85423cd3a0b7a25c076a710c4 /service/test
parent8310db57c7f1829497ebadddff65682392a60a27 (diff)
#224 App is working without klein - migration to twisted "complete"
Diffstat (limited to 'service/test')
-rw-r--r--service/test/functional/features/environment.py2
-rw-r--r--service/test/support/integration/app_test_client.py2
-rw-r--r--service/test/support/integration/soledad_test_base.py2
-rw-r--r--service/test/unit/controllers/mails_controller_test.py2
-rw-r--r--service/test/unit/controllers/sync_info_controller_test.py2
5 files changed, 5 insertions, 5 deletions
diff --git a/service/test/functional/features/environment.py b/service/test/functional/features/environment.py
index 72140e40..e4c4fa0c 100644
--- a/service/test/functional/features/environment.py
+++ b/service/test/functional/features/environment.py
@@ -19,7 +19,7 @@ from test.support.dispatcher.proxy import Proxy
from test.support.integration import AppTestClient
from selenium import webdriver
-from pixelated.controllers.features_controller import FeaturesController
+from pixelated.resources.features_resource import FeaturesController
def before_all(context):
diff --git a/service/test/support/integration/app_test_client.py b/service/test/support/integration/app_test_client.py
index eab001c6..b032eefd 100644
--- a/service/test/support/integration/app_test_client.py
+++ b/service/test/support/integration/app_test_client.py
@@ -29,7 +29,7 @@ from pixelated.adapter.services.mail_service import MailService
from pixelated.adapter.services.mailboxes import Mailboxes
from pixelated.adapter.soledad.soledad_querier import SoledadQuerier
from pixelated.adapter.services.tag_service import TagService
-from pixelated.controllers import FeaturesController, HomeController, MailsController, TagsController, \
+from pixelated.resources import FeaturesController, HomeController, MailsController, TagsController, \
SyncInfoController, AttachmentsController, ContactsController
import pixelated.runserver
from pixelated.adapter.model.mail import PixelatedMail
diff --git a/service/test/support/integration/soledad_test_base.py b/service/test/support/integration/soledad_test_base.py
index 4149462c..5892de60 100644
--- a/service/test/support/integration/soledad_test_base.py
+++ b/service/test/support/integration/soledad_test_base.py
@@ -15,7 +15,7 @@
# along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
import unittest
-from pixelated.controllers import *
+from pixelated.resources import *
from test.support.integration.app_test_client import AppTestClient
from test.support.integration.model import ResponseMail
diff --git a/service/test/unit/controllers/mails_controller_test.py b/service/test/unit/controllers/mails_controller_test.py
index 8108bc19..7e5d0e7d 100644
--- a/service/test/unit/controllers/mails_controller_test.py
+++ b/service/test/unit/controllers/mails_controller_test.py
@@ -20,7 +20,7 @@ from io import BytesIO
from klein.test_resource import requestMock
from mock import MagicMock
from mockito import *
-from pixelated.controllers.mails_controller import MailsController
+from pixelated.resources.mails_controller import MailsController
class TestMailsController(unittest.TestCase):
diff --git a/service/test/unit/controllers/sync_info_controller_test.py b/service/test/unit/controllers/sync_info_controller_test.py
index cd3aeb02..1fb38822 100644
--- a/service/test/unit/controllers/sync_info_controller_test.py
+++ b/service/test/unit/controllers/sync_info_controller_test.py
@@ -17,7 +17,7 @@ import unittest
import json
from mock import MagicMock
-from pixelated.controllers import SyncInfoController
+from pixelated.resources import SyncInfoController
from mockito import *