Skip to content

Commit 06314a0

Browse files
Put waitFor back in keyboard_textfield_test integration test (#102315)
1 parent b63689d commit 06314a0

File tree

2 files changed

+7
-21
lines changed

2 files changed

+7
-21
lines changed

dev/integration_tests/ui/lib/keyboard_textfield.dart

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,10 @@ class _MyHomePageState extends State<MyHomePage> {
6262
Text('$offset',
6363
key: const ValueKey<String>(keys.kOffsetText),
6464
),
65-
Text(
66-
isSoftKeyboardVisible ? 'keyboard visible' : 'keyboard hidden',
67-
key: const ValueKey<String>(keys.kKeyboardVisibleView),
65+
if (isSoftKeyboardVisible) const Text(
66+
'keyboard visible',
67+
key: ValueKey<String>(keys.kKeyboardVisibleView),
6868
),
69-
const ElevatedButton(onPressed: debugDumpApp, child: Text('dump app')),
7069
Expanded(
7170
child: ListView(
7271
key: const ValueKey<String>(keys.kListView),

dev/integration_tests/ui/test_driver/keyboard_textfield_test.dart

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -40,23 +40,10 @@ void main() {
4040
// Bring up keyboard
4141
await driver.tap(textFieldFinder);
4242

43-
const int keyboardTimeout = 3;
44-
bool keyboardVisible = false;
45-
for (int i = 0; i < keyboardTimeout; i++) {
46-
await Future<void>.delayed(const Duration(seconds: 1));
47-
final String keyboardVisibilityText = await driver.getText(keyboardVisibilityIndicatorFinder);
48-
keyboardVisible = keyboardVisibilityText == 'keyboard visible';
49-
if (keyboardVisible) {
50-
break;
51-
}
52-
}
53-
54-
if (!keyboardVisible) {
55-
await driver.tap(find.text('dump app'));
56-
}
57-
58-
// TODO(jmagman): Remove timeout once flake has been diagnosed. https://github.com/flutter/flutter/issues/96787
59-
expect(keyboardVisible, isTrue);
43+
// The blinking cursor may have animation. Do not wait for it to finish.
44+
await driver.runUnsynchronized(() async {
45+
await driver.waitFor(keyboardVisibilityIndicatorFinder);
46+
});
6047

6148
// Ensure that TextField is visible again
6249
await driver.waitFor(textFieldFinder);

0 commit comments

Comments
 (0)