[CI] Implement new cross-platform mock server

.github/workflows/cron-checks.yml

@@ -79,8 +79,7 @@ jobs:
         name: Test Data E2E (iOS ${{ matrix.ios }})
         path: |
           fastlane/recordings
-          fastlane/sinatra_log.txt
-          fastlane/test_output/report.junit
+          fastlane/stream-chat-test-mock-server/logs/*
           fastlane/test_output/logs/*/Diagnostics/**/*.txt
           fastlane/test_output/logs/*/Diagnostics/simctl_diagnostics/DiagnosticReports/*
 

.github/workflows/smoke-checks.yml

@@ -118,8 +118,6 @@ jobs:
       with:
         name: Test Data UI
         path: |
-          fastlane/recordings
-          fastlane/sinatra_log.txt
           fastlane/test_output/snapshots
           fastlane/test_output/logs/*/Diagnostics/**/*.txt
           fastlane/test_output/logs/*/Diagnostics/simctl_diagnostics/DiagnosticReports/*
@@ -199,8 +197,7 @@ jobs:
         name: Test Data E2E ${{ matrix.batch }}
         path: |
           fastlane/recordings
-          fastlane/sinatra_log.txt
-          fastlane/test_output/report.junit
+          fastlane/stream-chat-test-mock-server/logs/*
           fastlane/test_output/logs/*/Diagnostics/**/*.txt
           fastlane/test_output/logs/*/Diagnostics/simctl_diagnostics/DiagnosticReports/*
 

.gitignore

@@ -101,6 +101,7 @@ app-thinning.plist
 *.dmg
 yeetd-normal.pkg
 *LinkMap.txt
+stream-chat-test-mock-server
 
 # VSCode
 .vscode

Gemfile

@@ -22,6 +22,8 @@ group :fastlane_dependencies do
 end
 
 group :sinatra_dependencies do
+  gem 'eventmachine'
+  gem 'faye-websocket'
   gem 'puma'
   gem 'rackup'
 end

Gemfile.lock

@@ -126,8 +126,9 @@ GEM
     drb (2.2.3)
     emoji_regex (3.2.3)
     escape (0.0.4)
-    ethon (0.16.0)
+    ethon (0.17.0)
       ffi (>= 1.15.0)
+    eventmachine (1.2.7)
     excon (0.112.0)
     faraday (1.10.4)
       faraday-em_http (~> 1.0)
@@ -215,7 +216,10 @@ GEM
       xcsize (= 1.2.0)
     fastlane-sirp (1.0.0)
       sysrandom (~> 1.0)
-    ffi (1.17.2)
+    faye-websocket (0.12.0)
+      eventmachine (>= 0.12.0)
+      websocket-driver (>= 0.8.0)
+    ffi (1.17.2-arm64-darwin)
     fourflusher (2.3.1)
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
@@ -403,6 +407,10 @@ GEM
       concurrent-ruby (~> 1.0)
     uber (0.1.0)
     unicode-display_width (2.6.0)
+    websocket-driver (0.8.0)
+      base64
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.5)
     word_wrap (1.0.0)
     xcodeproj (1.27.0)
       CFPropertyList (>= 2.3.3, < 4.0)
@@ -426,13 +434,15 @@ DEPENDENCIES
   cocoapods
   danger
   danger-commit_lint
+  eventmachine
   fastlane
   fastlane-plugin-create_xcframework
   fastlane-plugin-lizard
   fastlane-plugin-sonarcloud_metric_kit
   fastlane-plugin-stream_actions (= 0.3.102)
   fastlane-plugin-versioning
   fastlane-plugin-xcsize (= 1.2.0)
+  faye-websocket
   json
   lefthook
   plist

Sources/StreamChatSwiftUI/ChatChannel/Composer/MessageComposerView.swift

@@ -99,13 +99,13 @@ public struct MessageComposerView<Factory: ViewFactory>: View, KeyboardReadable
                     enabled: viewModel.sendButtonEnabled,
                     cooldownDuration: viewModel.cooldownDuration
                 ) {
+                    // Calling onMessageSent() before erasing the edited and quoted message
+                    // so that onMessageSent can use them for state handling.
+                    onMessageSent()
                     viewModel.sendMessage(
                         quotedMessage: quotedMessage,
                         editedMessage: editedMessage
                     ) {
-                        // Calling onMessageSent() before erasing the edited and quoted message
-                        // so that onMessageSent can use them for state handling.
-                        onMessageSent()
                         quotedMessage = nil
                         editedMessage = nil
                     }

StreamChatSwiftUI.xcodeproj/project.pbxproj

@@ -39,7 +39,6 @@
 		820A61A029D6D78E002257FB /* QuotedReply_Tests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 820A619F29D6D78E002257FB /* QuotedReply_Tests.swift */; };
 		825AADF4283CCDB000237498 /* ThreadPage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 825AADF3283CCDB000237498 /* ThreadPage.swift */; };
 		827352FD290BE91100A87385 /* NotificationsHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8492974827ABDDBF00A8EEB0 /* NotificationsHandler.swift */; };
-		829AB4D228578ACF002DC629 /* StreamTestCase+Tags.swift in Sources */ = {isa = PBXBuildFile; fileRef = 829AB4D128578ACF002DC629 /* StreamTestCase+Tags.swift */; };
 		829AB4D42858A532002DC629 /* Reactions_Tests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 829AB4D32858A532002DC629 /* Reactions_Tests.swift */; };
 		829CD5CE2848CA6B003C3877 /* Settings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 829CD5CD2848CA6B003C3877 /* Settings.swift */; };
 		829EF8772A9362C00045D166 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 829EF8762A9362C00045D166 /* PrivacyInfo.xcprivacy */; };
@@ -648,7 +647,6 @@
 		4FEAB3172BFF71F70057E511 /* SwiftUI+UIAlertController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SwiftUI+UIAlertController.swift"; sourceTree = "<group>"; };
 		820A619F29D6D78E002257FB /* QuotedReply_Tests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QuotedReply_Tests.swift; sourceTree = "<group>"; };
 		825AADF3283CCDB000237498 /* ThreadPage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThreadPage.swift; sourceTree = "<group>"; };
-		829AB4D128578ACF002DC629 /* StreamTestCase+Tags.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "StreamTestCase+Tags.swift"; sourceTree = "<group>"; };
 		829AB4D32858A532002DC629 /* Reactions_Tests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Reactions_Tests.swift; sourceTree = "<group>"; };
 		829CD5CD2848CA6B003C3877 /* Settings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Settings.swift; sourceTree = "<group>"; };
 		829EF8762A9362C00045D166 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
@@ -2310,13 +2308,12 @@
 			isa = PBXGroup;
 			children = (
 				A3600B3F283F651200E1C930 /* Base TestCase */,
+				82A1814528FD69E8005F9D43 /* Message Delivery Status */,
 				82A1813D28FD68A3005F9D43 /* ChannelList_Tests.swift */,
 				A3600B31283E9E4700E1C930 /* MessageList_Tests.swift */,
 				829AB4D32858A532002DC629 /* Reactions_Tests.swift */,
 				82A1813B28F9BA53005F9D43 /* Attachments_Tests.swift */,
 				82A1814328FD69AE005F9D43 /* SlowMode_Tests.swift */,
-				829AB4D128578ACF002DC629 /* StreamTestCase+Tags.swift */,
-				82A1814528FD69E8005F9D43 /* Message Delivery Status */,
 				82A1813F28FD691B005F9D43 /* Ephemeral_Messages_Tests.swift */,
 				82A1814128FD694A005F9D43 /* PushNotification_Tests.swift */,
 				820A619F29D6D78E002257FB /* QuotedReply_Tests.swift */,
@@ -2650,7 +2647,6 @@
 				82A1814728FD69F8005F9D43 /* MessageDeliveryStatus_Tests.swift in Sources */,
 				A3600B2F283E9E1900E1C930 /* UserRobot+Asserts.swift in Sources */,
 				82A1814028FD691B005F9D43 /* Ephemeral_Messages_Tests.swift in Sources */,
-				829AB4D228578ACF002DC629 /* StreamTestCase+Tags.swift in Sources */,
 				82A1813C28F9BA53005F9D43 /* Attachments_Tests.swift in Sources */,
 				A3600B35283E9EBA00E1C930 /* Bundle+Target.swift in Sources */,
 				82A1813A28F84CAA005F9D43 /* SpringBoard.swift in Sources */,
@@ -3949,8 +3945,8 @@
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/GetStream/stream-chat-swift.git";
 			requirement = {
-				kind = upToNextMajorVersion;
-				minimumVersion = 4.95.1;
+				branch = develop;
+				kind = branch;
 			};
 		};
 		E3A1C01A282BAC66002D1E26 /* XCRemoteSwiftPackageReference "sentry-cocoa" */ = {

StreamChatSwiftUITestsAppTests/Pages/ChannelListPage.swift

@@ -50,7 +50,10 @@ enum ChannelListPage {
             cell.staticTexts["UnreadIndicatorView"]
         }
 
-        static func statusCheckmark(for status: MessageDeliveryStatus?, in cell: XCUIElement) -> XCUIElement {
+        static func statusCheckmark(
+            for status: StreamChatTestMockServer.MessageDeliveryStatus?,
+            in cell: XCUIElement
+        ) -> XCUIElement {
             return cell.images["readIndicatorCheckmark"]
         }
     }

StreamChatSwiftUITestsAppTests/Pages/MessageListPage.swift

@@ -110,12 +110,16 @@ class MessageListPage {
     }
 
     enum Attributes {
+        static func messageBubble(in messageCell: XCUIElement) -> XCUIElement {
+            messageCell.otherElements["MessageView"]
+        }
+
         static func reactionButton(in messageCell: XCUIElement) -> XCUIElement {
             messageCell.otherElements["ReactionsContainer"]
         }
 
         static func threadReplyCountButton(in messageCell: XCUIElement) -> XCUIElement {
-            messageCell.buttons["MessageAvatarViewPlaceholder"]
+            app.buttons.matching(NSPredicate(format: "identifier LIKE 'MessageAvatarView' or identifier LIKE 'MessageAvatarViewPlaceholder'")).firstMatch
         }
 
         static func reactions(in messageCell: XCUIElement) -> XCUIElementQuery {
@@ -167,7 +171,10 @@ class MessageListPage {
         }
 
         // FIXME:
-        static func statusCheckmark(for status: MessageDeliveryStatus? = nil, in messageCell: XCUIElement) -> XCUIElement {
+        static func statusCheckmark(
+            for status: StreamChatTestMockServer.MessageDeliveryStatus? = nil,
+            in messageCell: XCUIElement
+        ) -> XCUIElement {
             messageCell.images["readIndicatorCheckmark"]
         }
 
@@ -225,7 +232,7 @@ class MessageListPage {
         }
 
         static func files(in messageCell: XCUIElement) -> XCUIElementQuery {
-            messageCell.buttons.matching(NSPredicate(format: "identifier LIKE 'FileAttachmentsContainer'"))
+            messageCell.buttons.matching(NSPredicate(format: "identifier LIKE 'FileAttachmentsContainer' AND label != ''")).images
         }
 
         static func videoPlayer() -> XCUIElement {

StreamChatSwiftUITestsAppTests/Pages/SpringBoard.swift

@@ -22,4 +22,10 @@ enum SpringBoard {
     static var testAppIcon: XCUIElement {
         app.icons["Chat UI Tests"]
     }
+
+    static var photoAccessPopUp: XCUIElement {
+        app.buttons
+            .matching(NSPredicate(format: "label LIKE 'Allow Full Access'"))
+            .firstMatch
+    }
 }

StreamChatSwiftUITestsAppTests/Pages/ThreadPage.swift

@@ -7,4 +7,5 @@ import XCTest
 
 class ThreadPage: MessageListPage {
     static var alsoSendInChannelCheckbox: XCUIElement { app.buttons["SendInChannelView"] }
+    static var repliesCountLabel: XCUIElement { app.staticTexts["textLabel"] }
 }