fix payload in events unit tests

Author: Zsailer

jupyter_server/services/events/handlers.py

@@ -70,7 +70,7 @@ def on_close(self):
 
 def validate_model(data: Dict[str, Any]) -> None:
     """Validates for required fields in the JSON request body"""
-    required_keys = {"schema_id", "version", "event"}
+    required_keys = {"schema_id", "version", "data"}
     for key in required_keys:
         if key not in data:
             raise web.HTTPError(400, f"Missing `{key}` in the JSON request body.")
@@ -111,7 +111,7 @@ async def post(self):
             self.event_logger.emit(
                 schema_id=payload.get("schema_id"),
                 version=payload.get("version"),
-                data=payload.get("event"),
+                data=payload.get("data"),
                 timestamp_override=get_timestamp(payload),
             )
             self.set_status(204)

tests/services/events/test_api.py

@@ -46,7 +46,7 @@ async def test_subscribe_websocket(jp_ws_fetch, event_logger):
 {
     "schema_id": "event.mock.jupyter.org/message",
     "version": 1,
-    "event": {
+    "data": {
         "event_message": "Hello, world!"
     },
     "timestamp": "2022-05-26T12:50:00+06:00Z"
@@ -57,7 +57,7 @@ async def test_subscribe_websocket(jp_ws_fetch, event_logger):
 {
     "schema_id": "event.mock.jupyter.org/message",
     "version": 1,
-    "event": {
+    "data": {
         "event_message": "Hello, world!"
     }
 }
@@ -75,7 +75,7 @@ async def test_post_event(jp_fetch, event_logger_sink, payload):
     assert output
     input = json.loads(payload)
     data = json.loads(output)
-    assert input["event"]["event_message"] == data["event_message"]
+    assert input["data"]["event_message"] == data["event_message"]
     assert data["__timestamp__"]
     if "timestamp" in input:
         assert input["timestamp"] == data["__timestamp__"]
@@ -84,7 +84,7 @@ async def test_post_event(jp_fetch, event_logger_sink, payload):
 payload_3 = """\
 {
     "schema_id": "event.mock.jupyter.org/message",
-    "event": {
+    "data": {
         "event_message": "Hello, world!"
     }
 }
@@ -93,7 +93,7 @@ async def test_post_event(jp_fetch, event_logger_sink, payload):
 payload_4 = """\
 {
     "version": 1,
-    "event": {
+    "data": {
         "event_message": "Hello, world!"
     }
 }
@@ -110,7 +110,7 @@ async def test_post_event(jp_fetch, event_logger_sink, payload):
 {
     "schema_id": "event.mock.jupyter.org/message",
     "version": 1,
-    "event": {
+    "data": {
         "event_message": "Hello, world!"
     },
     "timestamp": "2022-05-26 12:50:00"
@@ -130,7 +130,7 @@ async def test_post_event_400(jp_fetch, event_logger, payload):
 {
     "schema_id": "event.mock.jupyter.org/message",
     "version": 1,
-    "event": {
+    "data": {
         "message": "Hello, world!"
     }
 }
@@ -140,7 +140,7 @@ async def test_post_event_400(jp_fetch, event_logger, payload):
 {
     "schema_id": "event.mock.jupyter.org/message",
     "version": 2,
-    "event": {
+    "data": {
         "message": "Hello, world!"
     }
 }