From 163be41d80a9ebec02816ade7287208a031da136 Mon Sep 17 00:00:00 2001 From: Yegor Date: Mon, 14 Oct 2019 15:14:16 -0700 Subject: [PATCH] Revert "Fix and enable painting tests on the Web (#42546)" (#42687) This reverts commit 13a1b1e3b9b58e7687e1bea5fac0452d52b48621. It broke the build. --- dev/bots/test.dart | 1 + packages/flutter/test/painting/image_provider_test.dart | 2 +- packages/flutter/test/painting/system_fonts_test.dart | 6 +++--- .../flutter_tools/lib/src/build_runner/build_script.dart | 1 - .../flutter_web_plugins/test/plugin_event_channel_test.dart | 4 ---- packages/flutter_web_plugins/test/plugin_registry_test.dart | 5 ----- 6 files changed, 5 insertions(+), 14 deletions(-) diff --git a/dev/bots/test.dart b/dev/bots/test.dart index 38c37259b76..6ba5ef13f78 100644 --- a/dev/bots/test.dart +++ b/dev/bots/test.dart @@ -443,6 +443,7 @@ Future _runWebTests() async { 'test/cupertino', 'test/examples', 'test/material', + 'test/painting', 'test/rendering', 'test/widgets', ]; diff --git a/packages/flutter/test/painting/image_provider_test.dart b/packages/flutter/test/painting/image_provider_test.dart index 3571dcf5c68..64ca2b255c1 100644 --- a/packages/flutter/test/painting/image_provider_test.dart +++ b/packages/flutter/test/painting/image_provider_test.dart @@ -181,7 +181,7 @@ void main() { .having((NetworkImageLoadException e) => e.statusCode, 'statusCode', errorStatusCode) .having((NetworkImageLoadException e) => e.uri, 'uri', Uri.base.resolve(requestUrl)), ); - }, skip: isBrowser); // Browser implementation does not use HTTP client but a tag. + }); test('Disallows null urls', () { expect(() { diff --git a/packages/flutter/test/painting/system_fonts_test.dart b/packages/flutter/test/painting/system_fonts_test.dart index 1b6532f9c89..508eeaf5be2 100644 --- a/packages/flutter/test/painting/system_fonts_test.dart +++ b/packages/flutter/test/painting/system_fonts_test.dart @@ -91,7 +91,7 @@ void main() { expect(cache.isEmpty, isTrue); final Element element = tester.element(find.byType(CupertinoDatePicker)); expect(element.dirty, isTrue); - }, skip: isBrowser); // TODO(yjbanov): cupertino does not work on the Web yet: https://github.com/flutter/flutter/issues/41920 + }); testWidgets('CupertinoDatePicker reset cache upon system fonts change - date mode', (WidgetTester tester) async { await tester.pumpWidget( @@ -118,7 +118,7 @@ void main() { expect(cache.isNotEmpty, isTrue); final Element element = tester.element(find.byType(CupertinoDatePicker)); expect(element.dirty, isTrue); - }, skip: isBrowser); // TODO(yjbanov): cupertino does not work on the Web yet: https://github.com/flutter/flutter/issues/41920 + }); testWidgets('CupertinoDatePicker reset cache upon system fonts change - time mode', (WidgetTester tester) async { await tester.pumpWidget( @@ -147,7 +147,7 @@ void main() { expect(state.numberLabelBaseline - 18.400070190429688 < precisionErrorTolerance, isTrue); final Element element = tester.element(find.byType(CupertinoTimerPicker)); expect(element.dirty, isTrue); - }, skip: isBrowser); // TODO(yjbanov): cupertino does not work on the Web yet: https://github.com/flutter/flutter/issues/41920 + }); testWidgets('RangeSlider relayout upon system fonts changes', (WidgetTester tester) async { await tester.pumpWidget( diff --git a/packages/flutter_tools/lib/src/build_runner/build_script.dart b/packages/flutter_tools/lib/src/build_runner/build_script.dart index 88c304d5929..a6975b859c5 100644 --- a/packages/flutter_tools/lib/src/build_runner/build_script.dart +++ b/packages/flutter_tools/lib/src/build_runner/build_script.dart @@ -277,7 +277,6 @@ Future main() async { // The following parameters are hard-coded in Flutter's test embedder. Since // we don't have an embedder yet this is the lowest-most layer we can put // this stuff in. - ui.debugEmulateFlutterTesterEnvironment = true; await ui.webOnlyInitializeEngine(); // TODO(flutterweb): remove need for dynamic cast. (ui.window as dynamic).debugOverrideDevicePixelRatio(3.0); diff --git a/packages/flutter_web_plugins/test/plugin_event_channel_test.dart b/packages/flutter_web_plugins/test/plugin_event_channel_test.dart index cbbd81bd44a..074954a6412 100644 --- a/packages/flutter_web_plugins/test/plugin_event_channel_test.dart +++ b/packages/flutter_web_plugins/test/plugin_event_channel_test.dart @@ -5,16 +5,12 @@ @TestOn('chrome') // Uses web-only Flutter SDK import 'dart:async'; -import 'dart:ui' as ui; import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:flutter_web_plugins/flutter_web_plugins.dart'; void main() { - // Disabling tester emulation because this test relies on real message channel communication. - ui.debugEmulateFlutterTesterEnvironment = false; // ignore: undefined_prefixed_name - group('Plugin Event Channel', () { setUp(() { TestWidgetsFlutterBinding.ensureInitialized(); diff --git a/packages/flutter_web_plugins/test/plugin_registry_test.dart b/packages/flutter_web_plugins/test/plugin_registry_test.dart index a1f13f2d60d..9d779ce7c6c 100644 --- a/packages/flutter_web_plugins/test/plugin_registry_test.dart +++ b/packages/flutter_web_plugins/test/plugin_registry_test.dart @@ -4,8 +4,6 @@ @TestOn('chrome') // Uses web-only Flutter SDK -import 'dart:ui' as ui; - import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:flutter_web_plugins/flutter_web_plugins.dart'; @@ -29,9 +27,6 @@ class TestPlugin { } void main() { - // Disabling tester emulation because this test relies on real message channel communication. - ui.debugEmulateFlutterTesterEnvironment = false; // ignore: undefined_prefixed_name - group('Plugin Registry', () { setUp(() { TestWidgetsFlutterBinding.ensureInitialized();