[cupertino_ui] Unskip 5 passing web tests in adaptive_text_selection_toolbar_test and text_field_test (#12984)
Unskips 5 tests across 2 `cupertino_ui` test files that were previously skipped on the web (`skip: isBrowser`) due to issues that have since been resolved (removal of the HTML renderer and support for `StrutStyle` in CanvasKit/Skwasm):
- `packages/cupertino_ui/test/adaptive_text_selection_toolbar_test.dart`: Unskips 3 tests (https://github.com/flutter/flutter/issues/108382 — closed)
- `packages/cupertino_ui/test/text_field_test.dart`: Unskips 2 strut style tests (https://github.com/flutter/flutter/issues/32243 — closed)
Split out from https://github.com/flutter/flutter/pull/193171 per https://github.com/flutter/flutter/issues/188444.
## Pre-Review Checklist
diff --git a/packages/cupertino_ui/test/adaptive_text_selection_toolbar_test.dart b/packages/cupertino_ui/test/adaptive_text_selection_toolbar_test.dart
index 9284804..f3a0a19 100644
--- a/packages/cupertino_ui/test/adaptive_text_selection_toolbar_test.dart
+++ b/packages/cupertino_ui/test/adaptive_text_selection_toolbar_test.dart
@@ -31,63 +31,56 @@
);
});
- testWidgets(
- 'Builds the right toolbar on each platform, including web, and shows buttonItems',
- (WidgetTester tester) async {
- const buttonText = 'Click me';
+ testWidgets('Builds the right toolbar on each platform, including web, and shows buttonItems', (
+ WidgetTester tester,
+ ) async {
+ const buttonText = 'Click me';
- await tester.pumpWidget(
- CupertinoApp(
- home: Center(
- child: CupertinoAdaptiveTextSelectionToolbar.buttonItems(
- anchors: const TextSelectionToolbarAnchors(primaryAnchor: Offset.zero),
- buttonItems: <ContextMenuButtonItem>[
- ContextMenuButtonItem(label: buttonText, onPressed: () {}),
- ],
- ),
+ await tester.pumpWidget(
+ CupertinoApp(
+ home: Center(
+ child: CupertinoAdaptiveTextSelectionToolbar.buttonItems(
+ anchors: const TextSelectionToolbarAnchors(primaryAnchor: Offset.zero),
+ buttonItems: <ContextMenuButtonItem>[
+ ContextMenuButtonItem(label: buttonText, onPressed: () {}),
+ ],
),
),
- );
+ ),
+ );
- expect(find.text(buttonText), findsOneWidget);
+ expect(find.text(buttonText), findsOneWidget);
- switch (defaultTargetPlatform) {
- case TargetPlatform.android:
- case TargetPlatform.fuchsia:
- case TargetPlatform.iOS:
- expect(find.byType(CupertinoTextSelectionToolbar), findsOneWidget);
- expect(find.byType(CupertinoDesktopTextSelectionToolbar), findsNothing);
- case TargetPlatform.macOS:
- case TargetPlatform.linux:
- case TargetPlatform.windows:
- expect(find.byType(CupertinoTextSelectionToolbar), findsNothing);
- expect(find.byType(CupertinoDesktopTextSelectionToolbar), findsOneWidget);
- }
- },
- variant: TargetPlatformVariant.all(),
- skip: isBrowser, // [intended] see https://github.com/flutter/flutter/issues/108382
- );
+ switch (defaultTargetPlatform) {
+ case TargetPlatform.android:
+ case TargetPlatform.fuchsia:
+ case TargetPlatform.iOS:
+ expect(find.byType(CupertinoTextSelectionToolbar), findsOneWidget);
+ expect(find.byType(CupertinoDesktopTextSelectionToolbar), findsNothing);
+ case TargetPlatform.macOS:
+ case TargetPlatform.linux:
+ case TargetPlatform.windows:
+ expect(find.byType(CupertinoTextSelectionToolbar), findsNothing);
+ expect(find.byType(CupertinoDesktopTextSelectionToolbar), findsOneWidget);
+ }
+ }, variant: TargetPlatformVariant.all());
- testWidgets(
- 'Can build children directly as well',
- (WidgetTester tester) async {
- final GlobalKey key = GlobalKey();
+ testWidgets('Can build children directly as well', (WidgetTester tester) async {
+ final GlobalKey key = GlobalKey();
- await tester.pumpWidget(
- CupertinoApp(
- home: Center(
- child: CupertinoAdaptiveTextSelectionToolbar(
- anchors: const TextSelectionToolbarAnchors(primaryAnchor: Offset.zero),
- children: <Widget>[Container(key: key)],
- ),
+ await tester.pumpWidget(
+ CupertinoApp(
+ home: Center(
+ child: CupertinoAdaptiveTextSelectionToolbar(
+ anchors: const TextSelectionToolbarAnchors(primaryAnchor: Offset.zero),
+ children: <Widget>[Container(key: key)],
),
),
- );
+ ),
+ );
- expect(find.byKey(key), findsOneWidget);
- },
- skip: isBrowser, // [intended] see https://github.com/flutter/flutter/issues/108382
- );
+ expect(find.byKey(key), findsOneWidget);
+ });
testWidgets(
'Can build from EditableTextState',
@@ -271,24 +264,21 @@
}
}, variant: TargetPlatformVariant.all());
- testWidgets(
- 'Builds empty toolbar when children and buttonItems are null',
- (WidgetTester tester) async {
- await tester.pumpWidget(
- const CupertinoApp(
- home: Center(
- child: CupertinoAdaptiveTextSelectionToolbar(
- anchors: TextSelectionToolbarAnchors(primaryAnchor: Offset.zero),
- children: null,
- ),
+ testWidgets('Builds empty toolbar when children and buttonItems are null', (
+ WidgetTester tester,
+ ) async {
+ await tester.pumpWidget(
+ const CupertinoApp(
+ home: Center(
+ child: CupertinoAdaptiveTextSelectionToolbar(
+ anchors: TextSelectionToolbarAnchors(primaryAnchor: Offset.zero),
+ children: null,
),
),
- );
+ ),
+ );
- expect(tester.getSize(find.byType(CupertinoAdaptiveTextSelectionToolbar)), Size.zero);
- expect(tester.takeException(), isNull);
- },
- skip: isBrowser, // [intended] see https://github.com/flutter/flutter/issues/108382
- variant: TargetPlatformVariant.all(),
- );
+ expect(tester.getSize(find.byType(CupertinoAdaptiveTextSelectionToolbar)), Size.zero);
+ expect(tester.takeException(), isNull);
+ }, variant: TargetPlatformVariant.all());
}
diff --git a/packages/cupertino_ui/test/text_field_test.dart b/packages/cupertino_ui/test/text_field_test.dart
index 42753ba..c047f59 100644
--- a/packages/cupertino_ui/test/text_field_test.dart
+++ b/packages/cupertino_ui/test/text_field_test.dart
@@ -777,52 +777,42 @@
expect(tester.getSize(find.byType(CupertinoTextField)), const Size(200, 65));
});
- testWidgets(
- 'strut height override',
- (WidgetTester tester) async {
- await tester.pumpWidget(
- CupertinoApp(
- home: Center(
- child: ConstrainedBox(
- constraints: BoxConstraints.loose(const Size(200, 200)),
- child: const CupertinoTextField(
- maxLines: 3,
- strutStyle: StrutStyle(fontSize: 8, forceStrutHeight: true),
- ),
+ testWidgets('strut height override', (WidgetTester tester) async {
+ await tester.pumpWidget(
+ CupertinoApp(
+ home: Center(
+ child: ConstrainedBox(
+ constraints: BoxConstraints.loose(const Size(200, 200)),
+ child: const CupertinoTextField(
+ maxLines: 3,
+ strutStyle: StrutStyle(fontSize: 8, forceStrutHeight: true),
),
),
),
- );
+ ),
+ );
- expect(tester.getSize(find.byType(CupertinoTextField)), const Size(200, 38));
- },
- // TODO(mdebbar): Strut styles support.
- skip: isBrowser, // https://github.com/flutter/flutter/issues/32243
- );
+ expect(tester.getSize(find.byType(CupertinoTextField)), const Size(200, 38));
+ });
- testWidgets(
- 'strut forces field taller',
- (WidgetTester tester) async {
- await tester.pumpWidget(
- CupertinoApp(
- home: Center(
- child: ConstrainedBox(
- constraints: BoxConstraints.loose(const Size(200, 200)),
- child: const CupertinoTextField(
- maxLines: 3,
- style: TextStyle(fontSize: 10),
- strutStyle: StrutStyle(fontSize: 18, forceStrutHeight: true),
- ),
+ testWidgets('strut forces field taller', (WidgetTester tester) async {
+ await tester.pumpWidget(
+ CupertinoApp(
+ home: Center(
+ child: ConstrainedBox(
+ constraints: BoxConstraints.loose(const Size(200, 200)),
+ child: const CupertinoTextField(
+ maxLines: 3,
+ style: TextStyle(fontSize: 10),
+ strutStyle: StrutStyle(fontSize: 18, forceStrutHeight: true),
),
),
),
- );
+ ),
+ );
- expect(tester.getSize(find.byType(CupertinoTextField)), const Size(200, 68));
- },
- // TODO(mdebbar): Strut styles support.
- skip: isBrowser, // https://github.com/flutter/flutter/issues/32243
- );
+ expect(tester.getSize(find.byType(CupertinoTextField)), const Size(200, 68));
+ });
testWidgets('default text field has a border', (WidgetTester tester) async {
await tester.pumpWidget(const CupertinoApp(home: Center(child: CupertinoTextField())));
