[CI] Make CI green again (#3259)

GetStream · Jun 20, 2024 · f93cf27 · f93cf27
1 parent 6b4a079
commit f93cf27
Show file tree

Hide file tree

Showing 21 changed files with 129 additions and 41 deletions.
diff --git a/.github/workflows/cron-checks.yml b/.github/workflows/cron-checks.yml
@@ -25,7 +25,7 @@ jobs:
     - name: Build
       run: bundle exec fastlane build_test_app_and_frameworks
       timeout-minutes: 60
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       if: success()
       with:
         name: cache-derived-data
@@ -76,14 +76,15 @@ jobs:
       IOS_SIMULATOR_DEVICE: "${{ matrix.device }} (${{ matrix.ios }})" # For the Allure report
     steps:
     - uses: actions/[email protected]
-    - uses: actions/download-artifact@v3
+    - uses: actions/download-artifact@v4
       with:
         name: cache-derived-data
         path: derived_data/Build/
     - uses: ./.github/actions/bootstrap
       env:
         INSTALL_ALLURE: true
         INSTALL_YEETD: true
+        SKIP_MINT_BOOTSTRAP: true
     - name: Cache iOS Simulator Runtime
       uses: actions/cache@v4
       id: runtime-cache
@@ -124,7 +125,7 @@ jobs:
       run: |
         brew install chargepoint/xcparse/xcparse
         xcparse logs fastlane/test_output/StreamChatUITestsApp.xcresult fastlane/test_output/logs/
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       if: failure()
       with:
         name: Test Data E2E (iOS ${{ matrix.ios }})
@@ -206,7 +207,7 @@ jobs:
       run: |
         brew install chargepoint/xcparse/xcparse
         xcparse logs fastlane/test_output/StreamChat.xcresult fastlane/test_output/logs/
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       if: failure()
       with:
         name: Test Data LLC (iOS ${{ matrix.ios }})

diff --git a/.github/workflows/smoke-checks.yml b/.github/workflows/smoke-checks.yml
@@ -33,7 +33,9 @@ jobs:
     - name: Build
       run: bundle exec fastlane build_test_app_and_frameworks
       timeout-minutes: 60
-    - uses: actions/upload-artifact@v3
+      env:
+        XCODE_VERSION: "15.0.1" # Should match the minimum version in dependent jobs
+    - uses: actions/upload-artifact@v4
       if: success()
       with:
         name: cache-derived-data
@@ -54,7 +56,7 @@ jobs:
     - uses: actions/[email protected]
       with:
         fetch-depth: 100
-    - uses: actions/download-artifact@v3
+    - uses: actions/download-artifact@v4
       with:
         name: cache-derived-data
         path: derived_data/Build/
@@ -64,7 +66,7 @@ jobs:
     - uses: ./.github/actions/python-cache
     - name: Run LLC Tests (Debug)
       run: bundle exec fastlane test device:"${{ env.IOS_SIMULATOR_DEVICE }}" skip_build:true
-      timeout-minutes: 30
+      timeout-minutes: 60
     - name: Get branch name
       id: get_branch_name
       run: echo "branch=${GITHUB_REF#refs/heads/}" >> $GITHUB_OUTPUT
@@ -90,7 +92,7 @@ jobs:
       run: |
         brew install chargepoint/xcparse/xcparse
         xcparse logs fastlane/test_output/StreamChat.xcresult fastlane/test_output/logs/
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       if: failure()
       with:
         name: Test Data LLC
@@ -105,16 +107,17 @@ jobs:
     if: ${{ github.event_name != 'push' }}
     steps:
     - uses: actions/[email protected]
-    - uses: actions/download-artifact@v3
+    - uses: actions/download-artifact@v4
       with:
         name: cache-derived-data
         path: derived_data/Build/
     - uses: ./.github/actions/bootstrap
       env:
         INSTALL_YEETD: true
+        SKIP_MINT_BOOTSTRAP: true
     - name: Run UI Tests (Debug)
       run: bundle exec fastlane test_ui device:"${{ env.IOS_SIMULATOR_DEVICE }}" skip_build:true record:${{ github.event.inputs.snapshots }}
-      timeout-minutes: 25
+      timeout-minutes: 60
       env:
         GITHUB_TOKEN: ${{ secrets.DANGER_GITHUB_API_TOKEN }} # to open a PR
         GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} # to use github cli
@@ -124,7 +127,7 @@ jobs:
       run: |
         brew install chargepoint/xcparse/xcparse
         xcparse screenshots fastlane/test_output/StreamChatUI.xcresult fastlane/test_output/snapshots --test
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       if: failure()
       with:
         name: Test Data UIKit
@@ -142,22 +145,25 @@ jobs:
       LAUNCH_ID: ${{ needs.allure_testops_launch.outputs.launch_id }}
     strategy:
       matrix:
-        batch: [0, 1, 2]
+        batch: [0, 1]
       fail-fast: false
     steps:
     - uses: actions/[email protected]
-    - uses: actions/download-artifact@v3
+    - uses: actions/download-artifact@v4
       with:
         name: cache-derived-data
         path: derived_data/Build/
     - uses: ./.github/actions/bootstrap
       env:
         INSTALL_ALLURE: true
         INSTALL_YEETD: true
+        SKIP_MINT_BOOTSTRAP: true
     - name: Run UI Tests (Debug)
       run: bundle exec fastlane test_e2e_mock device:"${{ env.IOS_SIMULATOR_DEVICE }}" batch:'${{ matrix.batch }}' test_without_building:true
-      timeout-minutes: 60
+      timeout-minutes: 100
       env:
+        XCODE_VERSION: "15.0.1" # the most stable pair of Xcode
+        IOS_SIMULATOR_DEVICE: "iPhone 15 Pro (17.0)" # and iOS
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         GITHUB_PR_NUM: ${{ github.event.number }}
         MATRIX_SIZE: ${{ strategy.job-total }}
@@ -178,7 +184,7 @@ jobs:
       run: |
         brew install chargepoint/xcparse/xcparse
         xcparse logs fastlane/test_output/StreamChatUITestsApp.xcresult fastlane/test_output/logs/
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       if: failure()
       with:
         name: Test Data E2E
@@ -237,7 +243,7 @@ jobs:
       GITHUB_PR_NUM: ${{ github.event.number }}
     steps:
     - uses: actions/[email protected]
-    - uses: actions/download-artifact@v3
+    - uses: actions/download-artifact@v4
       with:
         name: cache-derived-data
         path: derived_data/Build/
@@ -269,7 +275,7 @@ jobs:
       GITHUB_PR_NUM: ${{ github.event.number }}
     steps:
     - uses: actions/[email protected]
-    - uses: actions/download-artifact@v3
+    - uses: actions/download-artifact@v4
       with:
         name: cache-derived-data
         path: derived_data/Build/

diff --git a/.github/workflows/xcmetrics.yml b/.github/workflows/xcmetrics.yml
@@ -49,7 +49,7 @@ jobs:
           MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
           APPSTORE_API_KEY: ${{ secrets.APPSTORE_API_KEY }}
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: Test Data

diff --git a/Scripts/bootstrap.sh b/Scripts/bootstrap.sh
@@ -40,8 +40,10 @@ chmod +x ./hooks/git-format-staged
 puts "Install brew dependencies"
 brew bundle -d
 
-puts "Bootstrap Mint dependencies"
-mint bootstrap --link
+if [ "${SKIP_MINT_BOOTSTRAP:-}" != true ]; then
+  puts "Bootstrap Mint dependencies"
+  mint bootstrap --link
+fi
 
 # Copy internal Xcode scheme to the right folder for
 puts "Adding DemoApp-StreamDevelopers.xcscheme to the Xcode project"

diff --git a/StreamChatUITestsAppUITests/Pages/MessageListPage.swift b/StreamChatUITestsAppUITests/Pages/MessageListPage.swift
@@ -217,6 +217,10 @@ class MessageListPage {
             }
             return messageCell.images[identifier]
         }
+
+        static func actionButtons() -> XCUIElementQuery {
+            app.buttons.matching(NSPredicate(format: "identifier LIKE 'ActionButton'"))
+        }
 
         static func giphyButtons(in messageCell: XCUIElement) -> XCUIElementQuery {
             messageCell.buttons.matching(NSPredicate(format: "identifier LIKE 'ActionButton'"))

diff --git a/StreamChatUITestsAppUITests/Robots/UserRobot+Asserts.swift b/StreamChatUITestsAppUITests/Robots/UserRobot+Asserts.swift
@@ -489,20 +489,30 @@ extension UserRobot {
     }
 
     @discardableResult
-    func assertMessageDeliveryStatus(
+    func waitForMessageDeliveryStatus(
         _ deliveryStatus: MessageDeliveryStatus?,
         at messageCellIndex: Int? = nil,
         file: StaticString = #filePath,
         line: UInt = #line
-    ) -> Self {
+    ) -> Bool {
         let messageCell = messageCell(withIndex: messageCellIndex, file: file, line: line)
         let checkmark = attributes.statusCheckmark(for: deliveryStatus, in: messageCell)
         if deliveryStatus == .failed || deliveryStatus == nil {
-            XCTAssertFalse(checkmark.exists, "Checkmark is visible", file: file, line: line)
+            return !checkmark.exists
         } else {
-            XCTAssertTrue(checkmark.wait(timeout: 15).exists, "Checkmark is not visible", file: file, line: line)
+            return checkmark.wait(timeout: 1).exists
         }
+    }
 
+    @discardableResult
+    func assertMessageDeliveryStatus(
+        _ deliveryStatus: MessageDeliveryStatus?,
+        at messageCellIndex: Int? = nil,
+        file: StaticString = #filePath,
+        line: UInt = #line
+    ) -> Self {
+        let success = waitForMessageDeliveryStatus(deliveryStatus, at: messageCellIndex, file: file, line: line)
+        XCTAssertTrue(success)
         return self
     }
 
@@ -739,7 +749,6 @@ extension UserRobot {
         XCTAssertEqual(quotedText, actualText)
         XCTAssertTrue(message.exists, "Quoted message was not showed")
         XCTAssertFalse(message.isEnabled, "Quoted message should be disabled")
-        XCTAssertTrue(message.waitForHitPoint().isHittable, "Quoted message is not visible")
 
         if !replyText.isEmpty {
             let message = attributes.text(replyText, in: messageCell).wait()

diff --git a/StreamChatUITestsAppUITests/Robots/UserRobot.swift b/StreamChatUITestsAppUITests/Robots/UserRobot.swift
@@ -32,18 +32,19 @@ final class UserRobot: Robot {
 
     @discardableResult
     func waitForChannelListToLoad() -> Self {
-        let cells = ChannelListPage.cells.waitCount(1, timeout: 7)
+        let timeout = 15.0
+        let cells = ChannelListPage.cells.waitCount(1, timeout: timeout)
 
         // TODO: CIS-1737
         if !cells.firstMatch.exists {
             for _ in 0...10 {
-                server.stop()
                 app.terminate()
-                _ = server.start(port: in_port_t(MockServerConfiguration.port))
+                server.stop()
+                _ = server.start(port: MockServerConfiguration.port)
                 sleep(1)
                 app.launch()
                 login()
-                cells.waitCount(1)
+                cells.waitCount(1, timeout: timeout)
                 if cells.firstMatch.exists { break }
             }
         }
@@ -375,6 +376,7 @@ extension UserRobot {
         } else {
             sendMessage("/giphy\(text)", waitForAppearance: false)
         }
+        MessageListPage.Attributes.actionButtons().firstMatch.wait()
         if send { tapOnSendGiphyButton() }
         return self
     }

diff --git a/StreamChatUITestsAppUITests/Tests/Attachments_Tests.swift b/StreamChatUITestsAppUITests/Tests/Attachments_Tests.swift
@@ -9,6 +9,7 @@ final class Attachments_Tests: StreamTestCase {
     override func setUpWithError() throws {
         try super.setUpWithError()
         addTags([.coreFeatures])
+        assertMockServer()
     }
 
     func test_uploadImage() throws {

diff --git a/StreamChatUITestsAppUITests/Tests/Base TestCase/StreamTestCase.swift b/StreamChatUITestsAppUITests/Tests/Base TestCase/StreamTestCase.swift
@@ -16,6 +16,7 @@ class StreamTestCase: XCTestCase {
     var server: StreamMockServer!
     var recordVideo = false
     var mockServerEnabled = true
+    var mockServerCrashed = false
     var switchApiKey = false
 
     override func setUpWithError() throws {
@@ -37,7 +38,6 @@ class StreamTestCase: XCTestCase {
         stopVideo()
         app.terminate()
         server.stop()
-        server = nil
         backendRobot.delayServerResponse(byTimeInterval: 0.0)
 
         try super.tearDownWithError()
@@ -47,6 +47,10 @@ class StreamTestCase: XCTestCase {
 }
 
 extension StreamTestCase {
+
+    func assertMockServer() {
+        XCTAssertFalse(mockServerCrashed, "Mock server failed on start")
+    }
 
     private func useMockServer() {
         if mockServerEnabled {
@@ -88,14 +92,15 @@ extension StreamTestCase {
         server.configure()
 
         for _ in 0...3 {
-            let serverHasStarted = server.start(port: in_port_t(MockServerConfiguration.port))
+            let serverHasStarted = server.start(port: MockServerConfiguration.port)
             if serverHasStarted {
                 return
             }
             server.stop()
+            MockServerConfiguration.port = UInt16(Int.random(in: 61000..<62000))
         }
 
-        XCTFail("Mock server failed on start")
+        mockServerCrashed = true
     }
 
     private func startVideo() {

diff --git a/StreamChatUITestsAppUITests/Tests/ChannelList_Tests.swift b/StreamChatUITestsAppUITests/Tests/ChannelList_Tests.swift
@@ -11,6 +11,7 @@ final class ChannelList_Tests: StreamTestCase {
     override func setUpWithError() throws {
         try super.setUpWithError()
         addTags([.coreFeatures])
+        assertMockServer()
     }
 
     func test_newMessageShownInChannelPreview_whenComingBackFromChannel() {

diff --git a/StreamChatUITestsAppUITests/Tests/Ephemeral_Messages_Tests.swift b/StreamChatUITestsAppUITests/Tests/Ephemeral_Messages_Tests.swift
@@ -5,6 +5,11 @@
 import XCTest
 
 final class Ephemeral_Messages_Tests: StreamTestCase {
+
+    override func setUpWithError() throws {
+        try super.setUpWithError()
+        assertMockServer()
+    }
 
     func test_userObservesAnimatedGiphy_whenUserAddsGiphyMessage() throws {
         linkToScenario(withId: 67)

diff --git a/...stsAppUITests/Tests/Message Delivery Status/MessageDeliveryStatus+ChannelList_Tests.swift b/...stsAppUITests/Tests/Message Delivery Status/MessageDeliveryStatus+ChannelList_Tests.swift
@@ -16,6 +16,7 @@ final class MessageDeliveryStatus_ChannelList_Tests: StreamTestCase {
     override func setUpWithError() throws {
         try super.setUpWithError()
         addTags([.messageDeliveryStatus])
+        assertMockServer()
     }
 
     func test_deliveryStatusClocksShownInPreview_whenTheLastMessageIsInPendingState() {

diff --git a/StreamChatUITestsAppUITests/Tests/Message Delivery Status/MessageDeliveryStatus_Tests.swift b/StreamChatUITestsAppUITests/Tests/Message Delivery Status/MessageDeliveryStatus_Tests.swift
@@ -17,6 +17,7 @@ final class MessageDeliveryStatus_Tests: StreamTestCase {
     override func setUpWithError() throws {
         try super.setUpWithError()
         addTags([.messageDeliveryStatus])
+        assertMockServer()
     }
 
     // MARK: Message List

diff --git a/StreamChatUITestsAppUITests/Tests/MessageList_Tests.swift b/StreamChatUITestsAppUITests/Tests/MessageList_Tests.swift
@@ -9,6 +9,7 @@ final class MessageList_Tests: StreamTestCase {
     override func setUpWithError() throws {
         try super.setUpWithError()
         addTags([.coreFeatures])
+        assertMockServer()
     }
 
     func test_messageListUpdates_whenUserSendsMessage() {
@@ -297,9 +298,17 @@ final class MessageList_Tests: StreamTestCase {
             userRobot.setConnectivity(to: .on)
         }
         THEN("new message is delivered") {
-            userRobot
+            let success = userRobot
                 .assertMessage(message)
-                .assertMessageDeliveryStatus(.sent, at: 0)
+                .waitForMessageDeliveryStatus(.sent, at: 0)
+
+            if success {
+                userRobot.assertMessageDeliveryStatus(.sent, at: 0)
+            } else {
+                userRobot
+                    .selectOptionFromContextMenu(option: .resend, forMessageAtIndex: 0)
+                    .assertMessageDeliveryStatus(.sent, at: 0)
+            }
         }
     }
 

diff --git a/StreamChatUITestsAppUITests/Tests/PushNotification_Tests.swift b/StreamChatUITestsAppUITests/Tests/PushNotification_Tests.swift
@@ -14,6 +14,7 @@ final class PushNotification_Tests: StreamTestCase {
         try XCTSkipIf(ProcessInfo().operatingSystemVersion.majorVersion < 14,
                       "Push notifications infra does not work on iOS < 14")
         try super.setUpWithError()
+        assertMockServer()
     }
 
     override func tearDownWithError() throws {