Unverified Commit 19d7925f authored by Jonah Williams's avatar Jonah Williams Committed by GitHub

set web device name to Chrome (#34856)

parent 36305256
...@@ -27,9 +27,9 @@ class WebApplicationPackage extends ApplicationPackage { ...@@ -27,9 +27,9 @@ class WebApplicationPackage extends ApplicationPackage {
Directory get webSourcePath => flutterProject.directory.childDirectory('web'); Directory get webSourcePath => flutterProject.directory.childDirectory('web');
} }
class WebDevice extends Device { class ChromeDevice extends Device {
WebDevice() : super( ChromeDevice() : super(
'web', 'chrome',
category: Category.web, category: Category.web,
platformType: PlatformType.web, platformType: PlatformType.web,
ephemeral: false, ephemeral: false,
...@@ -74,7 +74,7 @@ class WebDevice extends Device { ...@@ -74,7 +74,7 @@ class WebDevice extends Device {
bool isSupported() => flutterWebEnabled && canFindChrome(); bool isSupported() => flutterWebEnabled && canFindChrome();
@override @override
String get name => 'web'; String get name => 'Chrome';
@override @override
DevicePortForwarder get portForwarder => const NoOpDevicePortForwarder(); DevicePortForwarder get portForwarder => const NoOpDevicePortForwarder();
...@@ -143,9 +143,9 @@ class WebDevice extends Device { ...@@ -143,9 +143,9 @@ class WebDevice extends Device {
} }
class WebDevices extends PollingDeviceDiscovery { class WebDevices extends PollingDeviceDiscovery {
WebDevices() : super('web'); WebDevices() : super('chrome');
final WebDevice _webDevice = WebDevice(); final ChromeDevice _webDevice = ChromeDevice();
@override @override
bool get canListAnything => flutterWebEnabled; bool get canListAnything => flutterWebEnabled;
......
...@@ -13,7 +13,7 @@ import '../src/common.dart'; ...@@ -13,7 +13,7 @@ import '../src/common.dart';
import '../src/context.dart'; import '../src/context.dart';
void main() { void main() {
group(WebDevice, () { group(ChromeDevice, () {
MockChromeLauncher mockChromeLauncher; MockChromeLauncher mockChromeLauncher;
MockPlatform mockPlatform; MockPlatform mockPlatform;
MockProcessManager mockProcessManager; MockProcessManager mockProcessManager;
...@@ -26,13 +26,27 @@ void main() { ...@@ -26,13 +26,27 @@ void main() {
return null; return null;
}); });
}); });
test('Defaults', () async {
final ChromeDevice device = ChromeDevice();
expect(device.name, 'Chrome');
expect(device.id, 'chrome');
expect(device.supportsHotReload, true);
expect(device.supportsHotRestart, true);
expect(device.supportsStartPaused, true);
expect(device.supportsFlutterExit, true);
expect(device.supportsScreenshot, false);
expect(await device.isLocalEmulator, false);
});
testUsingContext('Invokes version command on non-Windows platforms', () async{ testUsingContext('Invokes version command on non-Windows platforms', () async{
when(mockPlatform.isWindows).thenReturn(false); when(mockPlatform.isWindows).thenReturn(false);
when(mockProcessManager.canRun('chrome.foo')).thenReturn(true); when(mockProcessManager.canRun('chrome.foo')).thenReturn(true);
when(mockProcessManager.run(<String>['chrome.foo', '--version'])).thenAnswer((Invocation invocation) async { when(mockProcessManager.run(<String>['chrome.foo', '--version'])).thenAnswer((Invocation invocation) async {
return MockProcessResult(0, 'ABC'); return MockProcessResult(0, 'ABC');
}); });
final WebDevice webDevice = WebDevice(); final ChromeDevice webDevice = ChromeDevice();
expect(webDevice.isSupported(), true); expect(webDevice.isSupported(), true);
expect(await webDevice.sdkNameAndVersion, 'ABC'); expect(await webDevice.sdkNameAndVersion, 'ABC');
...@@ -53,7 +67,7 @@ void main() { ...@@ -53,7 +67,7 @@ void main() {
])).thenAnswer((Invocation invocation) async { ])).thenAnswer((Invocation invocation) async {
return MockProcessResult(0, r'HKEY_CURRENT_USER\Software\Google\Chrome\BLBeacon\ version REG_SZ 74.0.0 A'); return MockProcessResult(0, r'HKEY_CURRENT_USER\Software\Google\Chrome\BLBeacon\ version REG_SZ 74.0.0 A');
}); });
final WebDevice webDevice = WebDevice(); final ChromeDevice webDevice = ChromeDevice();
expect(webDevice.isSupported(), true); expect(webDevice.isSupported(), true);
expect(await webDevice.sdkNameAndVersion, 'Google Chrome 74.0.0'); expect(await webDevice.sdkNameAndVersion, 'Google Chrome 74.0.0');
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment