Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-12-10 22:07:40 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #31 from matrix-org/client_api_resource

Browse source 
Merge rest servlets into the client json resource object
This commit is contained in:
Mark Haines 2015-01-23 10:55:18 +00:00
commit 7dfd99f163
5 changed files with 18 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

9
tests/rest/client/v1/test_presence.py
View file

@ -25,6 +25,8 @@ from ....utils import MockHttpResource, MockKey
from synapse.api.constants import PresenceState
from synapse.handlers.presence import PresenceHandler
from synapse.server import HomeServer
from synapse.rest.client.v1 import presence
from synapse.rest.client.v1 import events
OFFLINE = PresenceState.OFFLINE
@ -86,7 +88,7 @@ class PresenceStateTestCase(unittest.TestCase):
return defer.succeed([])
room_member_handler.get_rooms_for_user = get_rooms_for_user
hs.register_servlets()
presence.register_servlets(hs, self.mock_resource)
self.u_apple = hs.parse_userid(myid)
@ -172,7 +174,7 @@ class PresenceListTestCase(unittest.TestCase):
hs.get_auth().get_user_by_token = _get_user_by_token
hs.register_servlets()
presence.register_servlets(hs, self.mock_resource)
self.u_apple = hs.parse_userid("@apple:test")
self.u_banana = hs.parse_userid("@banana:test")
@ -283,7 +285,8 @@ class PresenceEventStreamTestCase(unittest.TestCase):
hs.get_auth().get_user_by_req = _get_user_by_req
hs.register_servlets()
presence.register_servlets(hs, self.mock_resource)
events.register_servlets(hs, self.mock_resource)
hs.handlers.room_member_handler = Mock(spec=[])

4
tests/rest/client/v1/test_profile.py
View file

@ -25,6 +25,8 @@ from ....utils import MockHttpResource, MockKey
from synapse.api.errors import SynapseError, AuthError
from synapse.server import HomeServer
from synapse.rest.client.v1 import profile
myid = "@1234ABCD:test"
PATH_PREFIX = "/_matrix/client/api/v1"
@ -61,7 +63,7 @@ class ProfileTestCase(unittest.TestCase):
hs.get_handlers().profile_handler = self.mock_handler
hs.register_servlets()
profile.register_servlets(hs, self.mock_resource)
@defer.inlineCallbacks
def test_get_my_name(self):