char
/
matrix-rust-sdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cargo fmt/update fixed olm

master
Devin R 2020-04-11 15:58:34 -04:00
parent 7aeeeea432
commit 5180f99a0e
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/request_builder.rs
View File

@ -291,8 +291,8 @@ mod test {
use std::collections::HashMap; use std::collections::HashMap;
use super::*; use super::*;
use crate::{AsyncClient, Session, identifiers::RoomId};
use crate::events::room::power_levels::NotificationPowerLevels; use crate::events::room::power_levels::NotificationPowerLevels;
use crate::{identifiers::RoomId, AsyncClient, Session};
use js_int::Int; use js_int::Int;
use mockito::{mock, Matcher}; use mockito::{mock, Matcher};
@ -331,7 +331,9 @@ mod test {
redact: Int::max_value(), redact: Int::max_value(),
state_default: Int::min_value(), state_default: Int::min_value(),
users_default: Int::min_value(), users_default: Int::min_value(),
notifications: NotificationPowerLevels { room: Int::min_value() }, notifications: NotificationPowerLevels {
room: Int::min_value(),
},
users: HashMap::default(), users: HashMap::default(),
}) })
.preset(RoomPreset::PrivateChat) .preset(RoomPreset::PrivateChat)
@ -346,10 +348,13 @@ mod test {
async fn get_message_events() { async fn get_message_events() {
let homeserver = Url::parse(&mockito::server_url()).unwrap(); let homeserver = Url::parse(&mockito::server_url()).unwrap();
let _m = mock("GET", Matcher::Regex(r"^/_matrix/client/r0/rooms/.*/messages".to_string())) let _m = mock(
.with_status(200) "GET",
.with_body_from_file("./tests/data/room_messages.json") Matcher::Regex(r"^/_matrix/client/r0/rooms/.*/messages".to_string()),
.create(); )
.with_status(200)
.with_body_from_file("./tests/data/room_messages.json")
.create();
let session = Session { let session = Session {
access_token: "1234".to_owned(), access_token: "1234".to_owned(),
@ -358,14 +363,13 @@ mod test {
}; };
let mut bldr = GetMessageBuilder::new(); let mut bldr = GetMessageBuilder::new();
bldr bldr.room_id(RoomId::try_from("!roomid:example.com").unwrap())
.room_id(RoomId::try_from("!roomid:example.com").unwrap())
.from("t47429-4392820_219380_26003_2265".to_string()) .from("t47429-4392820_219380_26003_2265".to_string())
.to("t4357353_219380_26003_2265".to_string()) .to("t4357353_219380_26003_2265".to_string())
.direction(Direction::Backward) .direction(Direction::Backward)
.limit(UInt::new(10).unwrap()); .limit(UInt::new(10).unwrap());
// TODO this makes ruma error `Err(IntoHttp(IntoHttpError(Query(Custom("unsupported value")))))`?? // TODO this makes ruma error `Err(IntoHttp(IntoHttpError(Query(Custom("unsupported value")))))`??
// .filter(RoomEventFilter::default()); // .filter(RoomEventFilter::default());
let mut cli = AsyncClient::new(homeserver, Some(session)).unwrap(); let mut cli = AsyncClient::new(homeserver, Some(session)).unwrap();
assert!(cli.get_message_events(bldr).await.is_ok()); assert!(cli.get_message_events(bldr).await.is_ok());