chris/ruwuma
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

appservice-api: Fix helper_tests

Browse Source
This commit is contained in:
Kévin Commaille 2022-03-04 13:02:09 +01:00 committed by Kévin Commaille
parent 9e736bec84
commit 4cefb9ef62
1 changed files with 35 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
crates/ruma-appservice-api/src/event/push_events.rs
View File

@ -109,43 +109,47 @@ pub mod v1 {
#[cfg(test)] #[cfg(test)]
mod helper_tests { mod helper_tests {
use ruma_client_api::sync::sync_events; use ruma_client_api::sync::sync_events;
use ruma_identifiers::room_id; use ruma_identifiers::{room_id, TransactionId};
use serde_json::json; use serde_json::{json, value::to_raw_value as to_raw_json_value};
use super::{AnyRoomEvent, IncomingRequest, Raw}; use super::{IncomingRequest, Raw};
#[test] #[test]
fn convert_incoming_request_to_sync_response() { fn convert_incoming_request_to_sync_response() {
let txn_id = "any_txn_id".to_owned(); let txn_id = <&TransactionId>::from("any_txn_id");
let state_event: AnyRoomEvent = serde_json::from_value(json!({ let state_event = Raw::from_json(
"content": {}, to_raw_json_value(&json!({
"event_id": "$h29iv0s8:example.com", "content": {},
"origin_server_ts": 1, "event_id": "$h29iv0s8:example.com",
"room_id": "!roomid:room.com", "origin_server_ts": 1,
"sender": "@carl:example.com", "room_id": "!roomid:room.com",
"state_key": "", "sender": "@carl:example.com",
"type": "m.room.name" "state_key": "",
})) "type": "m.room.name"
.unwrap(); }))
let message_event: AnyRoomEvent = serde_json::from_value(json!({ .unwrap(),
"type": "m.room.message", );
"event_id": "$143273582443PhrSn:example.com", let message_event = Raw::from_json(
"origin_server_ts": 1, to_raw_json_value(&json!({
"room_id": "!roomid:room.com", "type": "m.room.message",
"sender": "@user:example.com", "event_id": "$143273582443PhrSn:example.com",
"content": { "origin_server_ts": 1,
"body": "test", "room_id": "!roomid:room.com",
"msgtype": "m.audio", "sender": "@user:example.com",
"url": "mxc://example.com/AuDi0", "content": {
} "body": "test",
})) "msgtype": "m.audio",
.unwrap(); "url": "mxc://example.com/AuDi0",
}
}))
.unwrap(),
);
let events = vec![Raw::new(&state_event).unwrap(), Raw::new(&message_event).unwrap()]; let events = vec![state_event, message_event];
let incoming_request = IncomingRequest { txn_id: txn_id.clone(), events }; let incoming_request = IncomingRequest { txn_id: txn_id.into(), events };
let response: sync_events::Response = let response: sync_events::v3::Response =
incoming_request.try_into_sync_response(txn_id).unwrap(); incoming_request.try_into_sync_response("token").unwrap();
let response_rooms_join = response let response_rooms_join = response
.rooms .rooms