summary refs log tree commit diff
path: root/tests
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-10-13 14:33:48 +0100
committerErik Johnston <erik@matrix.org>2015-10-13 14:33:48 +0100
commitff2b66f42ed4d4f11ec6e1208aa8c4365f566923 (patch)
treeb3b5c85efff17d3c39f493e515ac27e099b62043 /tests
parentMerge pull request #300 from matrix-org/erikj/store_engine (diff)
parentupdate filtering tests (diff)
downloadsynapse-ff2b66f42ed4d4f11ec6e1208aa8c4365f566923.tar.xz
Merge pull request #301 from matrix-org/markjh/v2_filtering
Update the v2 filters to support filtering presence.
Diffstat (limited to 'tests')
-rw-r--r--tests/api/test_filtering.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/api/test_filtering.py b/tests/api/test_filtering.py
index 65b2f590c8..6942cdac51 100644
--- a/tests/api/test_filtering.py
+++ b/tests/api/test_filtering.py
@@ -345,9 +345,9 @@ class FilteringTestCase(unittest.TestCase):
         )
 
     @defer.inlineCallbacks
-    def test_filter_public_user_data_match(self):
+    def test_filter_presence_match(self):
         user_filter_json = {
-            "public_user_data": {
+            "presence": {
                 "types": ["m.*"]
             }
         }
@@ -368,13 +368,13 @@ class FilteringTestCase(unittest.TestCase):
             filter_id=filter_id,
         )
 
-        results = user_filter.filter_public_user_data(events=events)
+        results = user_filter.filter_presence(events=events)
         self.assertEquals(events, results)
 
     @defer.inlineCallbacks
-    def test_filter_public_user_data_no_match(self):
+    def test_filter_presence_no_match(self):
         user_filter_json = {
-            "public_user_data": {
+            "presence": {
                 "types": ["m.*"]
             }
         }
@@ -395,7 +395,7 @@ class FilteringTestCase(unittest.TestCase):
             filter_id=filter_id,
         )
 
-        results = user_filter.filter_public_user_data(events=events)
+        results = user_filter.filter_presence(events=events)
         self.assertEquals([], results)
 
     @defer.inlineCallbacks