Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-07 08:56:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

test: return chat ID from TestContext.exec_securejoin_qr()

Browse Source
This commit is contained in:
link2xt
2025-03-12 20:43:17 +00:00
committed by l
parent 296d2aa7f4
commit 4ec20ab9dc
2 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/test_utils.rs
View File

@@ -167,7 +167,10 @@ impl TestContextManager {
); );
} }
pub async fn execute_securejoin(&self, scanner: &TestContext, scanned: &TestContext) { /// Executes SecureJoin protocol between `scanner` and `scanned`.
///
/// Returns chat ID of the 1:1 chat for `scanner`.
pub async fn execute_securejoin(&self, scanner: &TestContext, scanned: &TestContext) -> ChatId {
self.section(&format!( self.section(&format!(
"{} scans {}'s QR code", "{} scans {}'s QR code",
scanner.name(), scanner.name(),
@@ -175,12 +178,20 @@ impl TestContextManager {
)); ));
let qr = get_securejoin_qr(&scanned.ctx, None).await.unwrap(); let qr = get_securejoin_qr(&scanned.ctx, None).await.unwrap();
self.exec_securejoin_qr(scanner, scanned, &qr).await; self.exec_securejoin_qr(scanner, scanned, &qr).await
} }
/// Executes SecureJoin initiated by `scanner` scanning `qr` generated by `scanned`. /// Executes SecureJoin initiated by `scanner` scanning `qr` generated by `scanned`.
pub async fn exec_securejoin_qr(&self, scanner: &TestContext, scanned: &TestContext, qr: &str) { ///
join_securejoin(&scanner.ctx, qr).await.unwrap(); /// The [`ChatId`] of the created chat is returned, for a SetupContact QR this is the 1:1
/// chat with `scanned`, for a SecureJoin QR this is the group chat.
pub async fn exec_securejoin_qr(
&self,
scanner: &TestContext,
scanned: &TestContext,
qr: &str,
) -> ChatId {
let chat_id = join_securejoin(&scanner.ctx, qr).await.unwrap();
loop { loop {
if let Some(sent) = scanner.pop_sent_msg_opt(Duration::ZERO).await { if let Some(sent) = scanner.pop_sent_msg_opt(Duration::ZERO).await {
@@ -191,6 +202,7 @@ impl TestContextManager {
break; break;
} }
} }
chat_id
} }
} }

8
src/tests/verified_chats.rs
View File

@@ -186,14 +186,14 @@ async fn test_missing_peerstate_reexecute_securejoin() -> Result<()> {
let alice_addr = alice.get_config(Config::Addr).await?.unwrap(); let alice_addr = alice.get_config(Config::Addr).await?.unwrap();
let bob = &tcm.bob().await; let bob = &tcm.bob().await;
enable_verified_oneonone_chats(&[alice, bob]).await; enable_verified_oneonone_chats(&[alice, bob]).await;
tcm.execute_securejoin(bob, alice).await; let chat_id = tcm.execute_securejoin(bob, alice).await;
let chat = bob.get_chat(alice).await; let chat = Chat::load_from_db(bob, chat_id).await?;
assert!(chat.is_protected()); assert!(chat.is_protected());
bob.sql bob.sql
.execute("DELETE FROM acpeerstates WHERE addr=?", (&alice_addr,)) .execute("DELETE FROM acpeerstates WHERE addr=?", (&alice_addr,))
.await?; .await?;
tcm.execute_securejoin(bob, alice).await; let chat_id = tcm.execute_securejoin(bob, alice).await;
let chat = bob.get_chat(alice).await; let chat = Chat::load_from_db(bob, chat_id).await?;
assert!(chat.is_protected()); assert!(chat.is_protected());
assert!(!chat.is_protection_broken()); assert!(!chat.is_protection_broken());
Ok(()) Ok(())