Merge pull request #1400 from nextcloud/improve-ci

Improve CI
nextcloud · Oct 24, 2023 · 2421492 · 2421492
2 parents f1a33bc + e3f7831
commit 2421492
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/NextcloudTalk.xcodeproj/project.pbxproj b/NextcloudTalk.xcodeproj/project.pbxproj
@@ -1978,7 +1978,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "export PATH=\"$PATH:/opt/homebrew/bin\"\nif which swiftlint >/dev/null; then\n  swiftlint\nelse\n  echo \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi\n";
+			shellScript = "if [ -z \"$CI\" ]; then\n    export PATH=\"$PATH:/opt/homebrew/bin\"\n    if which swiftlint >/dev/null; then\n      swiftlint\n    else\n      echo \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\n    fi\nfi\n";
 		};
 		2C8035721F950BA800501B5C /* ShellScript */ = {
 			isa = PBXShellScriptBuildPhase;

diff --git a/NextcloudTalkUITests/NextcloudTalkUITests.swift b/NextcloudTalkUITests/NextcloudTalkUITests.swift
@@ -79,6 +79,7 @@ final class NextcloudTalkUITests: XCTestCase {
 
         // Wait shortly until the app is fully started
         let foundElement = waitForEitherElementToExist(accountSwitcherButton, serverAddressHttpsTextField, timeoutLong)
+        XCTAssertNotNil(foundElement)
 
         // When the account switcher button exists, we have atleast one account configured
         if foundElement == accountSwitcherButton {
@@ -166,10 +167,19 @@ final class NextcloudTalkUITests: XCTestCase {
 
         let chatNavBar = app.navigationBars["NextcloudTalk.ChatView"]
 
-        // Wait for titleView
-        let chatTitleView = chatNavBar.textViews.staticTexts[newConversationName]
+        // Wait for navigationBar
         XCTAssert(chatNavBar.waitForExistence(timeout: timeoutLong))
 
+        // Wait for titleView
+        let chatTitleView = chatNavBar.textViews[newConversationName]
+        XCTAssert(chatTitleView.waitForExistence(timeout: timeoutShort))
+
+        // Wait until we joined the room and the call buttons get active
+        let voiceCallButton = chatNavBar.buttons["Voice call"]
+        XCTAssert(voiceCallButton.waitForExistence(timeout: timeoutShort))
+        waitForEnabled(object: voiceCallButton)
+        waitForHittable(object: voiceCallButton)
+
         // Open conversation settings
         chatTitleView.tap()