summary refs log tree commit diff
diff options
context:
space:
mode:
authorKegan Dougal <kegan@matrix.org>2014-08-27 11:37:53 +0100
committerKegan Dougal <kegan@matrix.org>2014-08-27 11:37:53 +0100
commit135a1aa229f09badb7aeb79e803ab5d7654230ac (patch)
tree82920cd159ff73e3fd61a6dc5b7100d7f95918af
parentRenamed /rooms to /createRoom. Removed ability to PUT raw room IDs, and remov... (diff)
downloadsynapse-135a1aa229f09badb7aeb79e803ab5d7654230ac.tar.xz
Final url modifications: renamed /presence_list to /presence/list to keep the top-level namespace clean. Updated tests.
Diffstat (limited to '')
-rw-r--r--synapse/rest/presence.py2
-rw-r--r--tests/rest/test_presence.py6
2 files changed, 4 insertions, 4 deletions
diff --git a/synapse/rest/presence.py b/synapse/rest/presence.py
index 6043848595..e013b20853 100644
--- a/synapse/rest/presence.py
+++ b/synapse/rest/presence.py
@@ -68,7 +68,7 @@ class PresenceStatusRestServlet(RestServlet):
 
 
 class PresenceListRestServlet(RestServlet):
-    PATTERN = client_path_pattern("/presence_list/(?P<user_id>[^/]*)")
+    PATTERN = client_path_pattern("/presence/list/(?P<user_id>[^/]*)")
 
     @defer.inlineCallbacks
     def on_GET(self, request, user_id):
diff --git a/tests/rest/test_presence.py b/tests/rest/test_presence.py
index 970405d271..e249a0d48a 100644
--- a/tests/rest/test_presence.py
+++ b/tests/rest/test_presence.py
@@ -171,7 +171,7 @@ class PresenceListTestCase(unittest.TestCase):
         )
 
         (code, response) = yield self.mock_resource.trigger("GET",
-                "/presence_list/%s" % (myid), None)
+                "/presence/list/%s" % (myid), None)
 
         self.assertEquals(200, code)
         self.assertEquals(
@@ -192,7 +192,7 @@ class PresenceListTestCase(unittest.TestCase):
         )
 
         (code, response) = yield self.mock_resource.trigger("POST",
-            "/presence_list/%s" % (myid),
+            "/presence/list/%s" % (myid),
             """{"invite": ["@banana:test"]}"""
         )
 
@@ -212,7 +212,7 @@ class PresenceListTestCase(unittest.TestCase):
         )
 
         (code, response) = yield self.mock_resource.trigger("POST",
-            "/presence_list/%s" % (myid),
+            "/presence/list/%s" % (myid),
             """{"drop": ["@banana:test"]}"""
         )