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

Reland: rename web device (#34885)

Browse Source
This commit is contained in:
Jonah Williams 2019-06-24 11:09:07 -07:00 committed by GitHub
parent 8dbfc82bc7
commit 25b5656969
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dev/devicelab/lib/tasks/web_dev_mode_tests.dart
View File

@ -17,7 +17,7 @@ final Directory flutterGalleryDir = dir(path.join(flutterDirectory.path, 'exampl
TaskFunction createWebDevModeTest() {
return () async {
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);
int hotRestartCount = 0;

12
packages/flutter_tools/lib/src/web/web_device.dart
View File

@ -27,9 +27,9 @@ class WebApplicationPackage extends ApplicationPackage {
Directory get webSourcePath => flutterProject.directory.childDirectory('web');
}
class WebDevice extends Device {
WebDevice() : super(
'web',
class ChromeDevice extends Device {
ChromeDevice() : super(
'chrome',
category: Category.web,
platformType: PlatformType.web,
ephemeral: false,
@ -74,7 +74,7 @@ class WebDevice extends Device {
bool isSupported() => flutterWebEnabled && canFindChrome();
@override
String get name => 'web';
String get name => 'Chrome';
@override
DevicePortForwarder get portForwarder => const NoOpDevicePortForwarder();
@ -143,9 +143,9 @@ class WebDevice extends Device {
}
class WebDevices extends PollingDeviceDiscovery {
WebDevices() : super('web');
WebDevices() : super('chrome');
final WebDevice _webDevice = WebDevice();
final ChromeDevice _webDevice = ChromeDevice();
@override
bool get canListAnything => flutterWebEnabled;

28
packages/flutter_tools/test/web/devices_test.dart
View File

@ -13,7 +13,7 @@ import '../src/common.dart';
import '../src/context.dart';
void main() {
group(WebDevice, () {
group(ChromeDevice, () {
MockChromeLauncher mockChromeLauncher;
MockPlatform mockPlatform;
MockProcessManager mockProcessManager;
@ -26,16 +26,30 @@ void main() {
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{
when(mockPlatform.isWindows).thenReturn(false);
when(mockProcessManager.canRun('chrome.foo')).thenReturn(true);
when(mockProcessManager.run(<String>['chrome.foo', '--version'])).thenAnswer((Invocation invocation) async {
return MockProcessResult(0, 'ABC');
});
final WebDevice webDevice = WebDevice();
final ChromeDevice chromeDevice = ChromeDevice();
expect(webDevice.isSupported(), true);
expect(await webDevice.sdkNameAndVersion, 'ABC');
expect(chromeDevice.isSupported(), true);
expect(await chromeDevice.sdkNameAndVersion, 'ABC');
}, overrides: <Type, Generator>{
Platform: () => mockPlatform,
ProcessManager: () => mockProcessManager,
@ -53,10 +67,10 @@ void main() {
])).thenAnswer((Invocation invocation) async {
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(await webDevice.sdkNameAndVersion, 'Google Chrome 74.0.0');
expect(chromeDevice.isSupported(), true);
expect(await chromeDevice.sdkNameAndVersion, 'Google Chrome 74.0.0');
}, overrides: <Type, Generator>{
Platform: () => mockPlatform,
ProcessManager: () => mockProcessManager,