Match against the full condition from the spec

Author: erikjohnston

tests/rest/client/test_push_rule_attrs.py

@@ -428,8 +428,21 @@ def test_contains_user_name(self) -> None:
         )
 
         self.assertEqual(channel.code, 200)
-        self.assertIn("pattern", channel.json_body)
-        self.assertEqual(channel.json_body["pattern"], username)
+
+        self.assertEqual(
+            {
+                "rule_id": ".m.rule.contains_user_name",
+                "default": True,
+                "enabled": True,
+                "pattern": "bob",
+                "actions": [
+                    "notify",
+                    {"set_tweak": "highlight"},
+                    {"set_tweak": "sound", "value": "default"},
+                ],
+            },
+            channel.json_body,
+        )
 
     def test_is_user_mention(self) -> None:
         """
@@ -445,7 +458,24 @@ def test_is_user_mention(self) -> None:
         )
 
         self.assertEqual(channel.code, 200)
-        self.assertIn("conditions", channel.json_body)
-        self.assertEqual(len(channel.json_body["conditions"]), 1)
-        self.assertIn("value", channel.json_body["conditions"][0])
-        self.assertEqual(channel.json_body["conditions"][0]["value"], user)
+
+        self.assertEqual(
+            {
+                "rule_id": ".m.rule.is_user_mention",
+                "default": True,
+                "enabled": True,
+                "conditions": [
+                    {
+                        "kind": "event_property_contains",
+                        "key": "content.m\.mentions.user_ids",
+                        "value": "@bob:test",
+                    }
+                ],
+                "actions": [
+                    "notify",
+                    {"set_tweak": "highlight"},
+                    {"set_tweak": "sound", "value": "default"},
+                ],
+            },
+            channel.json_body,
+        )