From b03fe183bb2dece22e9d7cbdfada70e85e9a774c Mon Sep 17 00:00:00 2001
From: spaced4ndy <8711996+spaced4ndy@users.noreply.github.com>
Date: Wed, 11 Oct 2023 15:26:44 +0400
Subject: [PATCH] tests: modify testMemberContactInvitedConnectionReplaced to
 not rely on chat item order, print output (#3198)

---
 tests/ChatClient.hs       |  2 ++
 tests/ChatTests/Groups.hs | 10 ++++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/tests/ChatClient.hs b/tests/ChatClient.hs
index aae3b5c4c..fae460e90 100644
--- a/tests/ChatClient.hs
+++ b/tests/ChatClient.hs
@@ -210,6 +210,8 @@ withTestChatOpts tmp = withTestChatCfgOpts tmp testCfg
 withTestChatCfgOpts :: HasCallStack => FilePath -> ChatConfig -> ChatOpts -> String -> (HasCallStack => TestCC -> IO a) -> IO a
 withTestChatCfgOpts tmp cfg opts dbPrefix = bracket (startTestChat tmp cfg opts dbPrefix) (\cc -> cc <// 100000 >> stopTestChat cc)
 
+-- enable output for specific chat controller, use like this:
+-- withNewTestChat tmp "alice" aliceProfile $ \a -> withTestOutput a $ \alice -> do ...
 withTestOutput :: HasCallStack => TestCC -> (HasCallStack => TestCC -> IO a) -> IO a
 withTestOutput cc runTest = runTest cc {printOutput = True}
 
diff --git a/tests/ChatTests/Groups.hs b/tests/ChatTests/Groups.hs
index 997beec4e..6578df84c 100644
--- a/tests/ChatTests/Groups.hs
+++ b/tests/ChatTests/Groups.hs
@@ -3252,9 +3252,9 @@ testMemberContactProhibitedRepeatInv =
 
 testMemberContactInvitedConnectionReplaced :: HasCallStack => FilePath -> IO ()
 testMemberContactInvitedConnectionReplaced tmp = do
-  withNewTestChat tmp "alice" aliceProfile $ \alice -> do
-    withNewTestChat tmp "bob" bobProfile $ \bob -> do
-      withNewTestChat tmp "cath" cathProfile $ \cath -> do
+  withNewTestChat tmp "alice" aliceProfile $ \a -> withTestOutput a $ \alice -> do
+    withNewTestChat tmp "bob" bobProfile $ \b -> withTestOutput b $ \bob -> do
+      withNewTestChat tmp "cath" cathProfile $ \c -> withTestOutput c $ \cath -> do
         createGroup3 "team" alice bob cath
 
         alice ##> "/d bob"
@@ -3277,7 +3277,9 @@ testMemberContactInvitedConnectionReplaced tmp = do
           (alice <## "bob (Bob): contact is connected")
           (bob <## "alice (Alice): contact is connected")
 
-        bob #$> ("/_get chat @2 count=100", chat, chatFeatures <> [(0, "received invitation to join group team as admin"), (0, "contact deleted"), (0, "hi"), (0, "security code changed")] <> chatFeatures)
+        bob ##> "/_get chat @2 count=100"
+        items <- chat <$> getTermLine bob
+        items `shouldContain` [(0, "received invitation to join group team as admin"), (0, "contact deleted"), (0, "hi"), (0, "security code changed")]
 
     withTestChat tmp "bob" $ \bob -> do
       subscriptions bob 1