blade/simplex-chat
1
0
Fork 0
mirror of https://github.com/simplex-chat/simplex-chat.git synced 2024-12-17 17:20:21 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

core: don't keep connection of the merged contact (#2507)

Browse Source
This commit is contained in:
spaced4ndy
2023-05-25 20:54:31 +04:00
committed by GitHub
parent f9f34911b1
commit 6093219ce9
8 changed files with 77 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/ChatTests/Groups.hs
+15 -16
View File
@@ -1544,7 +1544,7 @@ testGroupLink =
concurrentlyN_
[ do
alice <## "bob (Bob): contact is connected"
alice <## "bob invited to group #team via your group link"
alice <## "invitation to join the group #team sent to bob"
alice <## "#team: bob joined the group",
do
bob <## "alice (Alice): contact is connected"
@@ -1580,7 +1580,7 @@ testGroupLink =
<### [ "cath_1 (Catherine): contact is connected",
"contact cath_1 is merged into cath",
"use @cath <message> to send messages",
EndsWith "invited to group #team via your group link",
StartsWith "invitation to join the group #team sent to cath",
EndsWith "joined the group"
],
cath
@@ -1634,7 +1634,7 @@ testGroupLinkDeleteGroupRejoin =
concurrentlyN_
[ do
alice <## "bob (Bob): contact is connected"
alice <## "bob invited to group #team via your group link"
alice <## "invitation to join the group #team sent to bob"
alice <## "#team: bob joined the group",
do
bob <## "alice (Alice): contact is connected"
@@ -1660,7 +1660,7 @@ testGroupLinkDeleteGroupRejoin =
<### [ "bob_1 (Bob): contact is connected",
"contact bob_1 is merged into bob",
"use @bob <message> to send messages",
EndsWith "invited to group #team via your group link",
StartsWith "invitation to join the group #team sent to bob",
EndsWith "joined the group"
],
bob
@@ -1690,7 +1690,7 @@ testGroupLinkContactUsed =
concurrentlyN_
[ do
alice <## "bob (Bob): contact is connected"
alice <## "bob invited to group #team via your group link"
alice <## "invitation to join the group #team sent to bob"
alice <## "#team: bob joined the group",
do
bob <## "alice (Alice): contact is connected"
@@ -1752,7 +1752,7 @@ testGroupLinkIncognitoMembership =
[ do
bob <## ("cath (Catherine): contact is connected, your incognito profile for this contact is " <> bobIncognito)
bob <## "use /i cath to print out this incognito profile again"
bob <## "cath invited to group #team via your group link"
bob <## "invitation to join the group #team sent to cath"
bob <## "#team: cath joined the group",
do
cath <## (bobIncognito <> ": contact is connected")
@@ -1778,7 +1778,7 @@ testGroupLinkIncognitoMembership =
[ do
bob <## (danIncognito <> ": contact is connected, your incognito profile for this contact is " <> bobIncognito)
bob <## ("use /i " <> danIncognito <> " to print out this incognito profile again")
bob <## (danIncognito <> " invited to group #team via your group link")
bob <## ("invitation to join the group #team sent to " <> danIncognito)
bob <## ("#team: " <> danIncognito <> " joined the group"),
do
dan <## (bobIncognito <> ": contact is connected, your incognito profile for this contact is " <> danIncognito)
@@ -1841,7 +1841,7 @@ testGroupLinkUnusedHostContactDeleted =
concurrentlyN_
[ do
alice <## "bob (Bob): contact is connected"
alice <## "bob invited to group #team via your group link"
alice <## "invitation to join the group #team sent to bob"
alice <## "#team: bob joined the group",
do
bob <## "alice (Alice): contact is connected"
@@ -1861,7 +1861,7 @@ testGroupLinkUnusedHostContactDeleted =
<### [ "bob_1 (Bob): contact is connected",
"contact bob_1 is merged into bob",
"use @bob <message> to send messages",
EndsWith "invited to group #club via your group link",
StartsWith "invitation to join the group #club sent to bob",
EndsWith "joined the group"
],
bob
@@ -1936,7 +1936,7 @@ testGroupLinkIncognitoUnusedHostContactsDeleted =
concurrentlyN_
[ do
alice <## (bobIncognito <> ": contact is connected")
alice <## (bobIncognito <> " invited to group #" <> group <> " via your group link")
alice <## ("invitation to join the group #" <> group <> " sent to " <> bobIncognito)
alice <## ("#" <> group <> ": " <> bobIncognito <> " joined the group"),
do
bob <## (bobsAliceContact <> " (Alice): contact is connected, your incognito profile for this contact is " <> bobIncognito)
@@ -1973,7 +1973,7 @@ testGroupLinkMemberRole =
concurrentlyN_
[ do
alice <## "bob (Bob): contact is connected"
alice <## "bob invited to group #team via your group link"
alice <## "invitation to join the group #team sent to bob"
alice <## "#team: bob joined the group",
do
bob <## "alice (Alice): contact is connected"
@@ -1986,12 +1986,11 @@ testGroupLinkMemberRole =
cath ##> ("/c " <> gLink)
cath <## "connection request sent!"
alice <## "cath (Catherine): accepting request to join group #team..."
-- if contact existed it is merged
concurrentlyN_
[ alice
<### [ "cath (Catherine): contact is connected",
EndsWith "invited to group #team via your group link",
EndsWith "joined the group"
"invitation to join the group #team sent to cath",
"#team: cath joined the group"
],
cath
<### [ "alice (Alice): contact is connected",
@@ -2041,7 +2040,7 @@ testGroupLinkLeaveDelete =
<### [ "bob_1 (Bob): contact is connected",
"contact bob_1 is merged into bob",
"use @bob <message> to send messages",
EndsWith "invited to group #team via your group link",
StartsWith "invitation to join the group #team sent to bob",
EndsWith "joined the group"
],
bob
@@ -2057,7 +2056,7 @@ testGroupLinkLeaveDelete =
concurrentlyN_
[ alice
<### [ "cath (Catherine): contact is connected",
"cath invited to group #team via your group link",
"invitation to join the group #team sent to cath",
"#team: cath joined the group"
],
cath
tests/ChatTests/Utils.hs
+6 -1
View File
@@ -267,7 +267,11 @@ cc <##.. ls = do
unless prefix $ print ("expected to start from one of: " <> show ls, ", got: " <> l)
prefix `shouldBe` True
data ConsoleResponse = ConsoleString String | WithTime String | EndsWith String
data ConsoleResponse
= ConsoleString String
| WithTime String
| EndsWith String
| StartsWith String
deriving (Show)
instance IsString ConsoleResponse where fromString = ConsoleString
@@ -287,6 +291,7 @@ getInAnyOrder f cc ls = do
ConsoleString s -> l == s
WithTime s -> dropTime_ l == Just s
EndsWith s -> s `isSuffixOf` l
StartsWith s -> s `isPrefixOf` l
(<###) :: HasCallStack => TestCC -> [ConsoleResponse] -> Expectation
(<###) = getInAnyOrder id