Merge commit '84684463204d32bc51ea50ddb5789b0cc17b280a' into pipelines/run-20261111-0240-perf-whole-pixel-window-frames-stop-per-89f6
This commit is contained in:
@@ -1,4 +1,3 @@
|
||||
import 'package:flutter/cupertino.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter/services.dart';
|
||||
import 'package:flutter_test/flutter_test.dart';
|
||||
@@ -35,16 +34,11 @@ Future<void> _search(WidgetTester tester) async {
|
||||
await tester.pumpAndSettle();
|
||||
}
|
||||
|
||||
Future<void> _pump(
|
||||
WidgetTester tester,
|
||||
AppDestination from, {
|
||||
bool cupertino = false,
|
||||
}) async {
|
||||
Future<void> _pump(WidgetTester tester, AppDestination from) async {
|
||||
tester.view.physicalSize = const Size(1200, 900);
|
||||
tester.view.devicePixelRatio = 1;
|
||||
addTearDown(tester.view.reset);
|
||||
final shell = AdaptiveShell(
|
||||
cupertino: cupertino,
|
||||
destination: from,
|
||||
destinationBodies: {
|
||||
for (final destination in AppDestination.values)
|
||||
@@ -53,9 +47,7 @@ Future<void> _pump(
|
||||
SearchScreen(gateway: _Gateway(), onOpen: (_) {}, embedded: true),
|
||||
},
|
||||
);
|
||||
await tester.pumpWidget(
|
||||
cupertino ? CupertinoApp(home: shell) : MaterialApp(home: shell),
|
||||
);
|
||||
await tester.pumpWidget(MaterialApp(home: shell));
|
||||
await tester.pumpAndSettle();
|
||||
}
|
||||
|
||||
@@ -87,24 +79,6 @@ void main() {
|
||||
);
|
||||
}
|
||||
|
||||
testWidgets(
|
||||
'Cupertino Escape preserves native Search focus handoff and previous tab',
|
||||
(tester) async {
|
||||
await _pump(tester, AppDestination.runs, cupertino: true);
|
||||
await _search(tester);
|
||||
await tester.enterText(find.byKey(searchFieldKey), 'query');
|
||||
await tester.pumpAndSettle();
|
||||
_field(tester).focusNode.unfocus();
|
||||
await tester.pumpAndSettle();
|
||||
await _press(tester, LogicalKeyboardKey.escape);
|
||||
expect(_field(tester).focusNode.hasPrimaryFocus, isTrue);
|
||||
expect(_field(tester).controller.text, 'query');
|
||||
await _press(tester, LogicalKeyboardKey.escape);
|
||||
expect(find.text('Body runs'), findsOneWidget);
|
||||
await tester.pumpWidget(const SizedBox.shrink());
|
||||
},
|
||||
);
|
||||
|
||||
testWidgets('Escape dismisses a Search dialog before changing tabs', (
|
||||
tester,
|
||||
) async {
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter/cupertino.dart';
|
||||
import 'package:flutter/services.dart';
|
||||
import 'package:flutter_test/flutter_test.dart';
|
||||
import 'package:pipelines_app/core/api_gateway.dart';
|
||||
@@ -130,58 +129,4 @@ void main() {
|
||||
variant: TargetPlatformVariant.only(platform),
|
||||
);
|
||||
}
|
||||
testWidgets(
|
||||
'Cupertino Command slash retains primary focus after query updates',
|
||||
(tester) async {
|
||||
final composer = TextEditingController(text: 'draft');
|
||||
final focus = FocusNode();
|
||||
addTearDown(composer.dispose);
|
||||
addTearDown(focus.dispose);
|
||||
await tester.pumpWidget(
|
||||
CupertinoApp(
|
||||
home: AdaptiveShell(
|
||||
cupertino: true,
|
||||
destination: AppDestination.chat,
|
||||
destinationBodies: {
|
||||
AppDestination.chat: (_) =>
|
||||
CupertinoTextField(controller: composer, focusNode: focus),
|
||||
AppDestination.search: (_) => SearchScreen(
|
||||
gateway: _Gateway(),
|
||||
onOpen: (_) {},
|
||||
embedded: true,
|
||||
),
|
||||
},
|
||||
),
|
||||
),
|
||||
);
|
||||
await tester.pumpAndSettle();
|
||||
focus.requestFocus();
|
||||
await tester.pump();
|
||||
await _chord(tester, [
|
||||
LogicalKeyboardKey.metaLeft,
|
||||
], LogicalKeyboardKey.slash);
|
||||
EditableText field() => tester.widget<EditableText>(
|
||||
find.descendant(
|
||||
of: find.byKey(searchFieldKey),
|
||||
matching: find.byType(EditableText),
|
||||
),
|
||||
);
|
||||
expect(field().focusNode.hasPrimaryFocus, isTrue);
|
||||
await tester.enterText(find.byKey(searchFieldKey), 'release');
|
||||
await tester.pumpAndSettle(const Duration(milliseconds: 300));
|
||||
await tester.pump(const Duration(seconds: 1));
|
||||
expect(field().controller.text, 'release');
|
||||
expect(field().focusNode.hasPrimaryFocus, isTrue);
|
||||
await tester.tap(find.byKey(const ValueKey('shell.destination.chat')));
|
||||
await tester.pumpAndSettle();
|
||||
focus.requestFocus();
|
||||
await tester.pump();
|
||||
await _chord(tester, [
|
||||
LogicalKeyboardKey.metaLeft,
|
||||
], LogicalKeyboardKey.slash);
|
||||
expect(field().controller.text, 'release');
|
||||
expect(field().focusNode.hasPrimaryFocus, isTrue);
|
||||
},
|
||||
variant: TargetPlatformVariant.only(TargetPlatform.macOS),
|
||||
);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user