mirror of
https://github.com/flutter/flutter
synced 2024-10-13 19:52:53 +00:00
Move material iOS back swipe test to material (#28855)
This commit is contained in:
parent
11678da3b0
commit
0b6b39b39e
7
packages/flutter/test/cupertino/README.md
Normal file
7
packages/flutter/test/cupertino/README.md
Normal file
|
@ -0,0 +1,7 @@
|
|||
# Tests for the Cupertino package
|
||||
|
||||
Avoid importing the Material 'package:flutter/material.dart' in these tests as
|
||||
we're trying to test the Cupertino package in standalone scenarios.
|
||||
|
||||
Some tests may be replicated in the Material tests when Material reuses
|
||||
Cupertino components on iOS such as page transitions and text editing.
|
|
@ -3,7 +3,6 @@
|
|||
// found in the LICENSE file.
|
||||
|
||||
import 'package:flutter/cupertino.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter/rendering.dart';
|
||||
import 'package:flutter_test/flutter_test.dart';
|
||||
|
||||
|
@ -256,20 +255,20 @@ void main() {
|
|||
});
|
||||
|
||||
testWidgets('Back swipe dismiss interrupted by route push', (WidgetTester tester) async {
|
||||
// Regression test for https://github.com/flutter/flutter/issues/28728
|
||||
final GlobalKey scaffoldKey = GlobalKey();
|
||||
|
||||
await tester.pumpWidget(
|
||||
MaterialApp(
|
||||
theme: ThemeData(platform: TargetPlatform.iOS),
|
||||
home: Scaffold(
|
||||
CupertinoApp(
|
||||
home: CupertinoPageScaffold(
|
||||
key: scaffoldKey,
|
||||
body: Center(
|
||||
child: RaisedButton(
|
||||
child: Center(
|
||||
child: CupertinoButton(
|
||||
onPressed: () {
|
||||
Navigator.push<void>(scaffoldKey.currentContext, MaterialPageRoute<void>(
|
||||
Navigator.push<void>(scaffoldKey.currentContext, CupertinoPageRoute<void>(
|
||||
builder: (BuildContext context) {
|
||||
return const Scaffold(
|
||||
body: Center(child: Text('route')),
|
||||
return const CupertinoPageScaffold(
|
||||
child: Center(child: Text('route')),
|
||||
);
|
||||
},
|
||||
));
|
||||
|
@ -294,17 +293,17 @@ void main() {
|
|||
await gesture.up();
|
||||
await tester.pump();
|
||||
expect( // The 'route' route has been dragged to the right, halfway across the screen
|
||||
tester.getTopLeft(find.ancestor(of: find.text('route'), matching: find.byType(Scaffold))),
|
||||
tester.getTopLeft(find.ancestor(of: find.text('route'), matching: find.byType(CupertinoPageScaffold))),
|
||||
const Offset(400, 0),
|
||||
);
|
||||
expect( // The 'push' route is sliding in from the left.
|
||||
tester.getTopLeft(find.ancestor(of: find.text('push'), matching: find.byType(Scaffold))).dx,
|
||||
tester.getTopLeft(find.ancestor(of: find.text('push'), matching: find.byType(CupertinoPageScaffold))).dx,
|
||||
lessThan(0),
|
||||
);
|
||||
await tester.pumpAndSettle();
|
||||
expect(find.text('push'), findsOneWidget);
|
||||
expect(
|
||||
tester.getTopLeft(find.ancestor(of: find.text('push'), matching: find.byType(Scaffold))),
|
||||
tester.getTopLeft(find.ancestor(of: find.text('push'), matching: find.byType(CupertinoPageScaffold))),
|
||||
Offset.zero,
|
||||
);
|
||||
expect(find.text('route'), findsNothing);
|
||||
|
|
|
@ -540,4 +540,80 @@ void main() {
|
|||
expect(find.text('Page 1'), isOnstage);
|
||||
expect(find.text('Page 2'), findsNothing);
|
||||
});
|
||||
|
||||
testWidgets('Back swipe dismiss interrupted by route push', (WidgetTester tester) async {
|
||||
// Regression test for https://github.com/flutter/flutter/issues/28728
|
||||
final GlobalKey scaffoldKey = GlobalKey();
|
||||
|
||||
await tester.pumpWidget(
|
||||
MaterialApp(
|
||||
theme: ThemeData(platform: TargetPlatform.iOS),
|
||||
home: Scaffold(
|
||||
key: scaffoldKey,
|
||||
body: Center(
|
||||
child: RaisedButton(
|
||||
onPressed: () {
|
||||
Navigator.push<void>(scaffoldKey.currentContext, MaterialPageRoute<void>(
|
||||
builder: (BuildContext context) {
|
||||
return const Scaffold(
|
||||
body: Center(child: Text('route')),
|
||||
);
|
||||
},
|
||||
));
|
||||
},
|
||||
child: const Text('push'),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
|
||||
// Check the basic iOS back-swipe dismiss transition. Dragging the pushed
|
||||
// route halfway across the screen will trigger the iOS dismiss animation
|
||||
|
||||
await tester.tap(find.text('push'));
|
||||
await tester.pumpAndSettle();
|
||||
expect(find.text('route'), findsOneWidget);
|
||||
expect(find.text('push'), findsNothing);
|
||||
|
||||
TestGesture gesture = await tester.startGesture(const Offset(5, 300));
|
||||
await gesture.moveBy(const Offset(400, 0));
|
||||
await gesture.up();
|
||||
await tester.pump();
|
||||
expect( // The 'route' route has been dragged to the right, halfway across the screen
|
||||
tester.getTopLeft(find.ancestor(of: find.text('route'), matching: find.byType(Scaffold))),
|
||||
const Offset(400, 0),
|
||||
);
|
||||
expect( // The 'push' route is sliding in from the left.
|
||||
tester.getTopLeft(find.ancestor(of: find.text('push'), matching: find.byType(Scaffold))).dx,
|
||||
lessThan(0),
|
||||
);
|
||||
await tester.pumpAndSettle();
|
||||
expect(find.text('push'), findsOneWidget);
|
||||
expect(
|
||||
tester.getTopLeft(find.ancestor(of: find.text('push'), matching: find.byType(Scaffold))),
|
||||
Offset.zero,
|
||||
);
|
||||
expect(find.text('route'), findsNothing);
|
||||
|
||||
|
||||
// Run the dismiss animation 75%, which exposes the route "push" button,
|
||||
// and then press the button. MaterialPageTransition duration is 300ms,
|
||||
// 275 = 300 * 0.75.
|
||||
|
||||
await tester.tap(find.text('push'));
|
||||
await tester.pumpAndSettle();
|
||||
expect(find.text('route'), findsOneWidget);
|
||||
expect(find.text('push'), findsNothing);
|
||||
|
||||
gesture = await tester.startGesture(const Offset(5, 300));
|
||||
await gesture.moveBy(const Offset(400, 0)); // drag halfway
|
||||
await gesture.up();
|
||||
await tester.pump(const Duration(milliseconds: 275)); // partially dismiss "route"
|
||||
expect(find.text('route'), findsOneWidget);
|
||||
await tester.tap(find.text('push'));
|
||||
await tester.pumpAndSettle();
|
||||
expect(find.text('route'), findsOneWidget);
|
||||
expect(find.text('push'), findsNothing);
|
||||
});
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue