Fix push rule evaluator tests

Author: Fizzadar

synapse/push/bulk_push_rule_evaluator.py

@@ -532,6 +532,7 @@ def _flatten_dict(
         if isinstance(value, str):
             result[".".join(prefix + [key])] = value.lower()
         elif isinstance(value, bool):
+            # Beeper: we need this for fi.mau.auto_accept_invite boolean
             result[".".join(prefix + [key])] = str(value).lower()
         elif isinstance(value, Mapping):
             # do not set `room_version` due to recursion considerations below

tests/push/test_push_rule_evaluator.py

@@ -58,7 +58,7 @@ def test_non_string(self) -> None:
             "fuzz": [],
             "boo": {},
         }
-        self.assertEqual({"woo": "woo"}, _flatten_dict(input))
+        self.assertEqual({"woo": "woo", "foo": "true"}, _flatten_dict(input))
 
     def test_event(self) -> None:
         """Events can also be flattened."""
@@ -836,6 +836,9 @@ def test_reactions(self) -> None:
 
         dm_evaluator = PushRuleEvaluator(
             _flatten_dict(reaction_event),
+            False,
+            set(),
+            False,
             2,
             0,
             {},
@@ -847,18 +850,21 @@ def test_reactions(self) -> None:
 
         # Reaction to Brad's message, should be an action for Brad
         actions = dm_evaluator.run(
-            FilteredPushRules(PushRules([]), {}, True, True), "@brad:beeper.com", "Brad"
+            FilteredPushRules(PushRules([]), {}, True, True, True, True, True), "@brad:beeper.com", "Brad"
         )
         self.assertTrue("notify" in actions)
 
         # Reaction to Brad's message, should not be an action for Nick
         actions = dm_evaluator.run(
-            FilteredPushRules(PushRules([]), {}, True, True), "@nick:beeper.com", "Nick"
+            FilteredPushRules(PushRules([]), {}, True, True, True, True, True), "@nick:beeper.com", "Nick"
         )
         self.assertEqual(actions, [])
 
         large_room_evaluator = PushRuleEvaluator(
             _flatten_dict(reaction_event),
+            False,
+            set(),
+            False,
             30,
             0,
             {},
@@ -870,11 +876,11 @@ def test_reactions(self) -> None:
 
         # Large rooms should never have emoji reaction notifications
         actions = large_room_evaluator.run(
-            FilteredPushRules(PushRules([]), {}, True, True), "@brad:beeper.com", "Brad"
+            FilteredPushRules(PushRules([]), {}, True, True, True, True, True), "@brad:beeper.com", "Brad"
         )
         self.assertEqual(actions, [])
         actions = large_room_evaluator.run(
-            FilteredPushRules(PushRules([]), {}, True, True), "@nick:beeper.com", "Nick"
+            FilteredPushRules(PushRules([]), {}, True, True, True, True, True), "@nick:beeper.com", "Nick"
         )
         self.assertEqual(actions, [])
 
@@ -898,6 +904,9 @@ def test_supress_auto_accept_invite(self) -> None:
 
         evaluator = PushRuleEvaluator(
             _flatten_dict(event),
+            False,
+            set(),
+            False,
             0,
             0,
             {},
@@ -908,7 +917,7 @@ def test_supress_auto_accept_invite(self) -> None:
         )
 
         actions = evaluator.run(
-            FilteredPushRules(PushRules([]), {}, True, True),
+            FilteredPushRules(PushRules([]), {}, True, True, True, True, True),
             "@brad:beeper.com",
             "Brad Murray",
         )