Unverified Commit 25b56569 authored by Jonah Williams's avatar Jonah Williams Committed by GitHub

Reland: rename web device (#34885)

parent 8dbfc82b
...@@ -17,7 +17,7 @@ final Directory flutterGalleryDir = dir(path.join(flutterDirectory.path, 'exampl ...@@ -17,7 +17,7 @@ final Directory flutterGalleryDir = dir(path.join(flutterDirectory.path, 'exampl
TaskFunction createWebDevModeTest() { TaskFunction createWebDevModeTest() {
return () async { return () async {
final List<String> options = <String>[ final List<String> options = <String>[
'--hot', '-d', 'web', '--verbose', '--resident', '--target=lib/main.dart', '--hot', '-d', 'chrome', '--verbose', '--resident', '--target=lib/main.dart',
]; ];
setLocalEngineOptionIfNecessary(options); setLocalEngineOptionIfNecessary(options);
int hotRestartCount = 0; int hotRestartCount = 0;
......
...@@ -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,16 +26,30 @@ void main() { ...@@ -26,16 +26,30 @@ void main() {
return null; return null;
}); });
}); });
test('Defaults', () async {
final ChromeDevice chromeDevice = ChromeDevice();
expect(chromeDevice.name, 'Chrome');
expect(chromeDevice.id, 'chrome');
expect(chromeDevice.supportsHotReload, true);
expect(chromeDevice.supportsHotRestart, true);
expect(chromeDevice.supportsStartPaused, true);
expect(chromeDevice.supportsFlutterExit, true);
expect(chromeDevice.supportsScreenshot, false);
expect(await chromeDevice.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 chromeDevice = ChromeDevice();
expect(webDevice.isSupported(), true); expect(chromeDevice.isSupported(), true);
expect(await webDevice.sdkNameAndVersion, 'ABC'); expect(await chromeDevice.sdkNameAndVersion, 'ABC');
}, overrides: <Type, Generator>{ }, overrides: <Type, Generator>{
Platform: () => mockPlatform, Platform: () => mockPlatform,
ProcessManager: () => mockProcessManager, ProcessManager: () => mockProcessManager,
...@@ -53,10 +67,10 @@ void main() { ...@@ -53,10 +67,10 @@ 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 chromeDevice = ChromeDevice();
expect(webDevice.isSupported(), true); expect(chromeDevice.isSupported(), true);
expect(await webDevice.sdkNameAndVersion, 'Google Chrome 74.0.0'); expect(await chromeDevice.sdkNameAndVersion, 'Google Chrome 74.0.0');
}, overrides: <Type, Generator>{ }, overrides: <Type, Generator>{
Platform: () => mockPlatform, Platform: () => mockPlatform,
ProcessManager: () => mockProcessManager, ProcessManager: () => mockProcessManager,
......
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