github/flutter
7
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2025-06-03 00:51:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Always evaluate the finder in driver.waitFor() and driver.waitForAbsent()

Browse Source 
Fixes #11327
This commit is contained in:
Todd Volkert 2017-07-20 14:33:35 -07:00 committed by Yegor
parent ba5bb57a52
commit 11d7c79b99
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/flutter_driver/lib/src/extension.dart
View File

@ -200,7 +200,7 @@ class FlutterDriverExtension {
if (_frameSync) if (_frameSync)
await _waitUntilFrame(() => SchedulerBinding.instance.transientCallbackCount == 0); await _waitUntilFrame(() => SchedulerBinding.instance.transientCallbackCount == 0);
await _waitUntilFrame(() => finder.precache()); await _waitUntilFrame(() => finder.evaluate().isNotEmpty);
if (_frameSync) if (_frameSync)
await _waitUntilFrame(() => SchedulerBinding.instance.transientCallbackCount == 0); await _waitUntilFrame(() => SchedulerBinding.instance.transientCallbackCount == 0);
@ -213,7 +213,7 @@ class FlutterDriverExtension {
if (_frameSync) if (_frameSync)
await _waitUntilFrame(() => SchedulerBinding.instance.transientCallbackCount == 0); await _waitUntilFrame(() => SchedulerBinding.instance.transientCallbackCount == 0);
await _waitUntilFrame(() => !finder.precache()); await _waitUntilFrame(() => finder.evaluate().isEmpty);
if (_frameSync) if (_frameSync)
await _waitUntilFrame(() => SchedulerBinding.instance.transientCallbackCount == 0); await _waitUntilFrame(() => SchedulerBinding.instance.transientCallbackCount == 0);
@ -268,10 +268,8 @@ class FlutterDriverExtension {
Future<WaitForResult> _waitFor(Command command) async { Future<WaitForResult> _waitFor(Command command) async {
final WaitFor waitForCommand = command; final WaitFor waitForCommand = command;
if ((await _waitForElement(_createFinder(waitForCommand.finder))).evaluate().isNotEmpty) await _waitForElement(_createFinder(waitForCommand.finder));
return new WaitForResult(); return new WaitForResult();
else
return null;
} }
Future<WaitForAbsentResult> _waitForAbsent(Command command) async { Future<WaitForAbsentResult> _waitForAbsent(Command command) async {