From 439aadf4e4c36ef6b475da4430c9dd241b09ea32 Mon Sep 17 00:00:00 2001 From: yjbanov Date: Wed, 17 Feb 2016 18:01:46 -0800 Subject: [PATCH] move to pub version of vm_service_client --- packages/flutter_driver/lib/src/driver.dart | 4 ++-- packages/flutter_driver/pubspec.yaml | 5 +---- packages/flutter_driver/test/flutter_driver_test.dart | 9 ++------- 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/packages/flutter_driver/lib/src/driver.dart b/packages/flutter_driver/lib/src/driver.dart index 10d77637fc..b4fbfe3eae 100644 --- a/packages/flutter_driver/lib/src/driver.dart +++ b/packages/flutter_driver/lib/src/driver.dart @@ -74,8 +74,8 @@ class FlutterDriver { // Waits for a signal from the VM service that the extension is registered Future waitForServiceExtension() { - return isolate.onServiceExtensionAdded.firstWhere((VMServiceExtension ext) { - return ext.method == _flutterExtensionMethod; + return isolate.onExtensionAdded.firstWhere((String extension) { + return extension == _flutterExtensionMethod; }); } diff --git a/packages/flutter_driver/pubspec.yaml b/packages/flutter_driver/pubspec.yaml index 2918a68002..d15ffba882 100644 --- a/packages/flutter_driver/pubspec.yaml +++ b/packages/flutter_driver/pubspec.yaml @@ -8,10 +8,7 @@ environment: sdk: '>=1.12.0 <2.0.0' dependencies: - vm_service_client: - git: - url: git://github.com/yjbanov/vm_service_client.git - ref: 54085d1 + vm_service_client: '>=0.1.2 <1.0.0' json_rpc_2: any logging: '>=0.11.0 <1.0.0' flutter: diff --git a/packages/flutter_driver/test/flutter_driver_test.dart b/packages/flutter_driver/test/flutter_driver_test.dart index 3dee762499..c2386b9187 100644 --- a/packages/flutter_driver/test/flutter_driver_test.dart +++ b/packages/flutter_driver/test/flutter_driver_test.dart @@ -46,10 +46,8 @@ main() { test('connects to isolate paused at start', () async { when(mockIsolate.pauseEvent).thenReturn(new MockVMPauseStartEvent()); when(mockIsolate.resume()).thenReturn(new Future.value()); - MockVMServiceExtension mockExtension = new MockVMServiceExtension(); - when(mockExtension.method).thenReturn('ext.flutter_driver'); - when(mockIsolate.onServiceExtensionAdded) - .thenReturn(new Stream.fromIterable([mockExtension])); + when(mockIsolate.onExtensionAdded) + .thenReturn(new Stream.fromIterable(['ext.flutter_driver'])); FlutterDriver driver = await FlutterDriver.connect(); expect(driver, isNotNull); @@ -203,6 +201,3 @@ class MockVMPauseBreakpointEvent extends Mock implements VMPauseBreakpointEvent @proxy class MockVMResumeEvent extends Mock implements VMResumeEvent { } - -@proxy -class MockVMServiceExtension extends Mock implements VMServiceExtension { }