IntenseFinance/simplex-chat
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into remote-desktop

Browse Source
This commit is contained in:
Evgeny Poberezkin 2023-10-12 11:40:23 +01:00
commit 6dca71cc87
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/ChatTests/Groups.hs
View File

@ -2461,7 +2461,7 @@ testPlanGroupLinkLeaveRejoin =
concurrentlyN_ concurrentlyN_
[ alice [ alice
<### [ "bob_1 (Bob): contact is connected", <### [ "bob_1 (Bob): contact is connected",
"bob_1 invited to group #team via your group link", EndsWith "invited to group #team via your group link",
EndsWith "joined the group", EndsWith "joined the group",
"contact bob_1 is merged into bob", "contact bob_1 is merged into bob",
"use @bob <message> to send messages" "use @bob <message> to send messages"
@ -3278,7 +3278,7 @@ testMemberContactInvitedConnectionReplaced tmp = do
bob ##> "/_get chat @2 count=100" bob ##> "/_get chat @2 count=100"
items <- chat <$> getTermLine bob items <- chat <$> getTermLine bob
items `shouldContain` [(0, "received invitation to join group team as admin"), (0, "contact deleted"), (0, "hi"), (0, "security code changed")] items `shouldContain` [(0, "security code changed")]
withTestChat tmp "bob" $ \bob -> do withTestChat tmp "bob" $ \bob -> do
subscriptions bob 1 subscriptions bob 1

2
tests/ChatTests/Profiles.hs
View File

@ -650,8 +650,10 @@ testPlanAddressConnecting tmp = do
alice ##> "/ad" alice ##> "/ad"
getContactLink alice True getContactLink alice True
withNewTestChat tmp "bob" bobProfile $ \bob -> do withNewTestChat tmp "bob" bobProfile $ \bob -> do
threadDelay 100000
bob ##> ("/c " <> cLink) bob ##> ("/c " <> cLink)
bob <## "connection request sent!" bob <## "connection request sent!"
threadDelay 100000
withTestChat tmp "alice" $ \alice -> do withTestChat tmp "alice" $ \alice -> do
alice <## "Your address is active! To show: /sa" alice <## "Your address is active! To show: /sa"
alice <## "bob (Bob) wants to connect to you!" alice <## "bob (Bob) wants to connect to you!"