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

chore: Make focus check before text input not mandatory #379

Merged
merged 1 commit into from
Sep 14, 2020
Merged

chore: Make focus check before text input not mandatory #379

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 8 additions & 12 deletions WebDriverAgentLib/Categories/XCUIElement+FBTyping.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
#import "FBXCodeCompatibility.h"

#define MAX_CLEAR_RETRIES 2
#define MAX_PREPARE_TRIES 2


@interface NSString (FBRepeat)
Expand Down Expand Up @@ -57,19 +56,16 @@ - (BOOL)fb_prepareForTextInputWithError:(NSError **)error

// There is no possibility to open the keyboard by tapping a field in TvOS
#if !TARGET_OS_TV
int tries = 0;
do {
[self fb_tapWithError:nil];
// It might take some time to update the UI
[self fb_waitUntilSnapshotIsStableWithTimeout:1];
if (self.fb_hasKeyboardFocus) {
return YES;
}
} while (++tries < MAX_PREPARE_TRIES);
[self fb_tapWithError:nil];
// It might take some time to update the UI
[self fb_waitUntilSnapshotIsStableWithTimeout:1];
if (self.fb_hasKeyboardFocus) {
return YES;
}
#endif

NSString *description = [NSString stringWithFormat:@"'%@' is not ready for a text input. Neither the accessibility element itself nor its accessible descendants have the input focus", self.description];
return [[[FBErrorBuilder builder] withDescription:description] buildError:error];
[FBLogger logFmt:@"'%@' is not ready for a text input. Neither the accessibility element itself nor its accessible descendants have the input focus. Continuing anyway", self.description];
return YES;
}

- (BOOL)fb_typeText:(NSString *)text error:(NSError **)error
Expand Down