From 18cd7a3601bcffb36fdf2f679f763b5e827c2e8e Mon Sep 17 00:00:00 2001 From: Todd Volkert Date: Wed, 11 Dec 2019 06:35:39 -0800 Subject: [PATCH] v1.12.13+hotfix.6 cherry-picks (#46741) * b63683b Update configuration for flutter features --- packages/flutter_tools/lib/src/features.dart | 4 ++++ .../flutter_tools/test/general.shard/features_test.dart | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/packages/flutter_tools/lib/src/features.dart b/packages/flutter_tools/lib/src/features.dart index fb0e0891172..6d50bbceb1a 100644 --- a/packages/flutter_tools/lib/src/features.dart +++ b/packages/flutter_tools/lib/src/features.dart @@ -91,6 +91,10 @@ const Feature flutterWebFeature = Feature( available: true, enabledByDefault: false, ), + beta: FeatureChannelSetting( + available: true, + enabledByDefault: false, + ), ); /// The [Feature] for macOS desktop. diff --git a/packages/flutter_tools/test/general.shard/features_test.dart b/packages/flutter_tools/test/general.shard/features_test.dart index fb04874d345..a9a05031cdd 100644 --- a/packages/flutter_tools/test/general.shard/features_test.dart +++ b/packages/flutter_tools/test/general.shard/features_test.dart @@ -78,7 +78,7 @@ void main() { })); test('flutter web help string', () { - expect(flutterWebFeature.generateHelpMessage(), 'Enable or disable Flutter for web. This setting will take effect on the master and dev channels.'); + expect(flutterWebFeature.generateHelpMessage(), 'Enable or disable Flutter for web. This setting will take effect on the master, dev, and beta channels.'); }); test('flutter macOS desktop help string', () { @@ -155,18 +155,18 @@ void main() { expect(featureFlags.isWebEnabled, false); })); - test('flutter web not enabled with config on beta', () => testbed.run(() { + test('flutter web enabled with config on beta', () => testbed.run(() { when(mockFlutterVerion.channel).thenReturn('beta'); when(mockFlutterConfig.getValue('enable-web') as bool).thenReturn(true); - expect(featureFlags.isWebEnabled, false); + expect(featureFlags.isWebEnabled, true); })); test('flutter web not enabled with environment variable on beta', () => testbed.run(() { when(mockFlutterVerion.channel).thenReturn('beta'); when(mockPlatform.environment).thenReturn({'FLUTTER_WEB': 'true'}); - expect(featureFlags.isWebEnabled, false); + expect(featureFlags.isWebEnabled, true); })); test('flutter web off by default on stable', () => testbed.run(() {