Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improve CI #1400

Merged
merged 2 commits into from
Oct 24, 2023
Merged

Improve CI #1400

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3be6e49
Improve detection of room joined on CI
SystemKeeper Oct 23, 2023
e3f7831
Don't run swiftlint on CI
SystemKeeper Oct 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion NextcloudTalk.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
14 changes: 12 additions & 2 deletions NextcloudTalkUITests/NextcloudTalkUITests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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()

Expand Down
Loading