development/flutter
development/flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter synced 2024-10-13 03:32:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "show web-server in flutter devices (#121373)" (#121532)

Browse source 
Revert "[flutter_tools] show web-server in flutter devices"
This commit is contained in:
Christopher Fujino 2023-02-27 10:44:09 -08:00 committed by GitHub
parent fd65fd1b16
commit 5c334d10df
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 32 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
View file

@ -18,6 +18,7 @@ import '../cache.dart';
import '../convert.dart';
import '../globals.dart' as globals;
import '../tester/flutter_tester.dart';
import '../web/web_device.dart';
class FlutterCommandRunner extends CommandRunner<void> {
FlutterCommandRunner({ bool verboseHelp = false }) : super(
@ -111,6 +112,11 @@ class FlutterCommandRunner extends CommandRunner<void> {
hide: !verboseHelp,
help: 'List the special "flutter-tester" device in device listings. '
'This headless device is used to test Flutter tooling.');
argParser.addFlag('show-web-server-device',
negatable: false,
hide: !verboseHelp,
help: 'List the special "web-server" device in device listings.',
);
}
@override
@ -209,6 +215,10 @@ class FlutterCommandRunner extends CommandRunner<void> {
|| topLevelResults['device-id'] == FlutterTesterDevices.kTesterDeviceId) {
FlutterTesterDevices.showFlutterTesterDevice = true;
}
if (((topLevelResults['show-web-server-device'] as bool?) ?? false)
|| topLevelResults['device-id'] == WebServerDevice.kWebServerDeviceId) {
WebServerDevice.showWebServerDevice = true;
}
// Set up the tooling configuration.
final EngineBuildPaths? engineBuildPaths = await globals.localEngineLocator?.findEnginePath(

2
packages/flutter_tools/lib/src/web/web_device.dart
View file

@ -357,6 +357,7 @@ class WebDevices extends PollingDeviceDiscovery {
}
final MicrosoftEdgeDevice? edgeDevice = _edgeDevice;
return <Device>[
if (WebServerDevice.showWebServerDevice)
_webServerDevice,
if (_chromeDevice.isSupported())
_chromeDevice,
@ -391,6 +392,7 @@ class WebServerDevice extends Device {
);
static const String kWebServerDeviceId = 'web-server';
static bool showWebServerDevice = false;
final Logger _logger;

19
packages/flutter_tools/test/general.shard/web/devices_test.dart
View file

@ -189,7 +189,8 @@ void main() {
isNot(contains(isA<GoogleChromeDevice>())));
});
testWithoutContext('Web Server device is listed', () async {
testWithoutContext('Web Server device is listed if enabled via showWebServerDevice', () async {
WebServerDevice.showWebServerDevice = true;
final WebDevices webDevices = WebDevices(
featureFlags: TestFeatureFlags(isWebEnabled: true),
fileSystem: MemoryFileSystem.test(),
@ -204,6 +205,22 @@ void main() {
contains(isA<WebServerDevice>()));
});
testWithoutContext('Web Server device is not listed if disabled via showWebServerDevice', () async {
WebServerDevice.showWebServerDevice = false;
final WebDevices webDevices = WebDevices(
featureFlags: TestFeatureFlags(isWebEnabled: true),
fileSystem: MemoryFileSystem.test(),
logger: BufferLogger.test(),
platform: FakePlatform(
environment: <String, String>{}
),
processManager: FakeProcessManager.any(),
);
expect(await webDevices.pollingGetDevices(),
isNot(contains(isA<WebServerDevice>())));
});
testWithoutContext('Chrome invokes version command on non-Windows platforms', () async {
final FakeProcessManager processManager = FakeProcessManager.list(<FakeCommand>[
const FakeCommand(