Resolve "Review tasks"

Closes #8 (closed)

aleksis/apps/matrix/tests/test_matrix.py

@@ -7,8 +7,13 @@ import pytest
 import requests
 from celery.result import AsyncResult
 
-from aleksis.apps.matrix.matrix import do_matrix_request
 from aleksis.apps.matrix.models import MatrixProfile, MatrixRoom, MatrixSpace
+from aleksis.apps.matrix.util.matrix import (
+    MatrixException,
+    build_url,
+    do_matrix_request,
+    get_headers,
+)
 from aleksis.core.models import Group, Person, SchoolTerm
 from aleksis.core.util.core_helpers import get_site_preferences
 
@@ -27,8 +32,6 @@ def test_connection(synapse):
 @pytest.fixture
 def matrix_bot_user(synapse):
 
-    from aleksis.apps.matrix.matrix import build_url
-
     body = {"username": "aleksis-bot", "password": "test", "auth": {"type": "m.login.dummy"}}
 
     get_site_preferences()["matrix__homeserver"] = SERVER_URL
@@ -52,8 +55,6 @@ def test_matrix_bot_user(matrix_bot_user):
 
 
 def test_create_room_for_group(matrix_bot_user):
-    from aleksis.apps.matrix.matrix import build_url, get_headers
-
     g = Group.objects.create(name="Test Room")
     assert not MatrixRoom.objects.all().exists()
     room = MatrixRoom.from_group(g)
@@ -79,8 +80,6 @@ def test_create_room_for_group_short_name(matrix_bot_user):
 
 
 def test_room_alias_collision_same_name(matrix_bot_user):
-    from aleksis.apps.matrix.matrix import MatrixException
-
     g1 = Group.objects.create(name="Test Room")
     g2 = Group.objects.create(name="test-room")
     g3 = Group.objects.create(name="Test-Room")
@@ -123,8 +122,6 @@ def test_room_alias_collision_school_term(matrix_bot_user):
 
 
 def test_sync_room_members(matrix_bot_user):
-    from aleksis.apps.matrix.matrix import build_url, get_headers
-
     get_site_preferences()["matrix__homeserver_ids"] = "matrix.aleksis.example.org"
 
     g = Group.objects.create(name="Test Room")
@@ -235,8 +232,6 @@ def test_sync_room_members_without_homeserver(matrix_bot_user):
 
 
 def test_use_room_sync(matrix_bot_user):
-    from aleksis.apps.matrix.matrix import build_url, get_headers
-
     get_site_preferences()["matrix__homeserver_ids"] = "matrix.aleksis.example.org"
 
     g = Group.objects.create(name="Test Room")