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

[MA 2747] Check keyboard existence in all foreground apps #2184

Merged
merged 2 commits into from
Dec 12, 2024
Merged

[MA 2747] Check keyboard existence in all foreground apps #2184

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
9d536e5
fix: check keyboard presence in all foreground apps
amanjeetsingh150 Dec 11, 2024
0cca2ff
fix: list all running apps as well
amanjeetsingh150 Dec 11, 2024
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 maestro-ios-driver/src/main/kotlin/util/XCRunnerCLIUtils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ object XCRunnerCLIUtils {
val mapper = jacksonObjectMapper()
val appsMap = mapper.readValue(json, Map::class.java) as Map<String, Any>

return appsMap.keys
return appsMap.keys + runningApps(deviceId).keys
Copy link
Collaborator Author

@amanjeetsingh150 amanjeetsingh150 Dec 11, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Included the runningApps as well since appsMap was not giving all the list of installed apps.

Includes runningApp as well to make sure we include any system app not in appsMap

}

fun setProxy(host: String, port: Int) {
Expand Down
Binary file modified maestro-ios-driver/src/main/resources/maestro-driver-ios.zip
View file
Open in desktop
Binary file not shown.
Binary file modified maestro-ios-driver/src/main/resources/maestro-driver-iosUITests-Runner.zip
View file
Open in desktop
Binary file not shown.
13 changes: 8 additions & 5 deletions maestro-ios-xctest-runner/maestro-driver-iosUITests/Routes/Handlers/EraseTextHandler.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@ struct EraseTextHandler: HTTPHandler {
do {
let start = Date()

let appId = RunningApp.getForegroundAppId(requestBody.appIds)
if let errorResponse = await waitUntilKeyboardIsPresented(appId: appId) {
if let errorResponse = await waitUntilKeyboardIsPresented(appIds: requestBody.appIds) {
return errorResponse
}

Expand All @@ -37,10 +36,14 @@ struct EraseTextHandler: HTTPHandler {
}
}

private func waitUntilKeyboardIsPresented(appId: String?) async -> HTTPResponse? {
private func waitUntilKeyboardIsPresented(appIds: [String]) async -> HTTPResponse? {
let foregroundAppIds = RunningApp.getForegroundAppIds(appIds)
logger.info("Foreground apps \(foregroundAppIds)")

let isKeyboardPresented: Bool = (try? await TimeoutHelper.repeatUntil(timeout: 1, delta: 0.2) {
guard let appId = appId else { return true }
return XCUIApplication(bundleIdentifier: appId).keyboards.firstMatch.exists
return foregroundAppIds.contains { appId in
XCUIApplication(bundleIdentifier: appId).keyboards.firstMatch.exists
}
}) ?? false

// Return an error response if the keyboard is not presented
Expand Down
13 changes: 8 additions & 5 deletions ...o-ios-xctest-runner/maestro-driver-iosUITests/Routes/Handlers/InputTextRouteHandler.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@ struct InputTextRouteHandler : HTTPHandler {
do {
let start = Date()

let appId = RunningApp.getForegroundAppId(requestBody.appIds)
if let errorResponse = await waitUntilKeyboardIsPresented(appId: appId) {
if let errorResponse = await waitUntilKeyboardIsPresented(appIds: requestBody.appIds) {
return errorResponse
}

Expand All @@ -32,10 +31,14 @@ struct InputTextRouteHandler : HTTPHandler {
}
}

private func waitUntilKeyboardIsPresented(appId: String?) async -> HTTPResponse? {
private func waitUntilKeyboardIsPresented(appIds: [String]) async -> HTTPResponse? {
let foregroundAppIds = RunningApp.getForegroundAppIds(appIds)
logger.info("Foreground apps \(foregroundAppIds)")

let isKeyboardPresented: Bool = (try? await TimeoutHelper.repeatUntil(timeout: 1, delta: 0.2) {
guard let appId = appId else { return true }
return XCUIApplication(bundleIdentifier: appId).keyboards.firstMatch.exists
return foregroundAppIds.contains { appId in
XCUIApplication(bundleIdentifier: appId).keyboards.firstMatch.exists
}
}) ?? false

// Return an error response if the keyboard is not presented
Expand Down
11 changes: 10 additions & 1 deletion maestro-ios-xctest-runner/maestro-driver-iosUITests/Routes/XCTest/RunningApp.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,14 @@ struct RunningApp {
} ?? RunningApp.springboardBundleId
}


static func getForegroundAppIds(_ appIds: [String]) -> [String] {
// springboard is always on foreground
let allAppIds = appIds + ["com.apple.springboard"]


return allAppIds.filter { appId in
let app = XCUIApplication(bundleIdentifier: appId)
return app.state == .runningForeground
}
}
}
Loading