summary refs log tree commit diff
path: root/tests
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-03-21 12:25:33 +0000
committerErik Johnston <erik@matrix.org>2019-03-21 12:48:37 +0000
commit164798ec32a30e07bd5972ec216e7848f0928c78 (patch)
tree498b115d9eb2b96c886087d85b6140df46cae412 /tests
parentCorrectly handle 3PID invites in create room spam check (diff)
downloadsynapse-164798ec32a30e07bd5972ec216e7848f0928c78.tar.xz
Add 3PID invite support to spam checker
Diffstat (limited to 'tests')
-rw-r--r--tests/rulecheck/test_domainrulecheck.py20
1 files changed, 11 insertions, 9 deletions
diff --git a/tests/rulecheck/test_domainrulecheck.py b/tests/rulecheck/test_domainrulecheck.py
index a887249b59..9c9f080f97 100644
--- a/tests/rulecheck/test_domainrulecheck.py
+++ b/tests/rulecheck/test_domainrulecheck.py
@@ -35,13 +35,15 @@ class DomainRuleCheckerTestCase(unittest.TestCase):
         }
         check = DomainRuleChecker(config)
         self.assertTrue(
-            check.user_may_invite("test:source_one", "test:target_one", "room", False)
+            check.user_may_invite(
+                "test:source_one", "test:target_one", None, "room", False,
+            )
         )
         self.assertTrue(
-            check.user_may_invite("test:source_one", "test:target_two", "room", False)
+            check.user_may_invite("test:source_one", "test:target_two", None, "room", False)
         )
         self.assertTrue(
-            check.user_may_invite("test:source_two", "test:target_two", "room", False)
+            check.user_may_invite("test:source_two", "test:target_two", None, "room", False)
         )
 
     def test_disallowed(self):
@@ -55,16 +57,16 @@ class DomainRuleCheckerTestCase(unittest.TestCase):
         }
         check = DomainRuleChecker(config)
         self.assertFalse(
-            check.user_may_invite("test:source_one", "test:target_three", "room", False)
+            check.user_may_invite("test:source_one", "test:target_three", None, "room", False)
         )
         self.assertFalse(
-            check.user_may_invite("test:source_two", "test:target_three", "room", False)
+            check.user_may_invite("test:source_two", "test:target_three", None, "room", False)
         )
         self.assertFalse(
-            check.user_may_invite("test:source_two", "test:target_one", "room", False)
+            check.user_may_invite("test:source_two", "test:target_one", None, "room", False)
         )
         self.assertFalse(
-            check.user_may_invite("test:source_four", "test:target_one", "room", False)
+            check.user_may_invite("test:source_four", "test:target_one", None, "room", False)
         )
 
     def test_default_allow(self):
@@ -77,7 +79,7 @@ class DomainRuleCheckerTestCase(unittest.TestCase):
         }
         check = DomainRuleChecker(config)
         self.assertTrue(
-            check.user_may_invite("test:source_three", "test:target_one", "room", False)
+            check.user_may_invite("test:source_three", "test:target_one", None, "room", False)
         )
 
     def test_default_deny(self):
@@ -90,7 +92,7 @@ class DomainRuleCheckerTestCase(unittest.TestCase):
         }
         check = DomainRuleChecker(config)
         self.assertFalse(
-            check.user_may_invite("test:source_three", "test:target_one", "room", False)
+            check.user_may_invite("test:source_three", "test:target_one", None, "room", False)
         )
 
     def test_config_parse(self):