@@ -33,19 +33,22 @@ void main () {
33
33
34
34
late PerAccountStore store;
35
35
late FakeApiConnection connection;
36
+ late List <Route <dynamic >> pushedRoutes;
36
37
37
- Future <void > prepare (WidgetTester tester, {
38
- NavigatorObserver ? navigatorObserver,
39
- }) async {
38
+ final testNavObserver = TestNavigatorObserver ()
39
+ ..onPushed = (route, prevRoute) => pushedRoutes.add (route);
40
+
41
+ Future <void > prepare (WidgetTester tester) async {
40
42
addTearDown (testBinding.reset);
43
+ pushedRoutes = [];
41
44
await testBinding.globalStore.add (eg.selfAccount, eg.initialSnapshot ());
42
45
store = await testBinding.globalStore.perAccount (eg.selfAccount.id);
43
46
connection = store.connection as FakeApiConnection ;
44
47
await store.addUser (eg.selfUser);
45
48
46
49
await tester.pumpWidget (TestZulipApp (
47
50
accountId: eg.selfAccount.id,
48
- navigatorObservers: navigatorObserver != null ? [navigatorObserver] : [ ],
51
+ navigatorObservers: [testNavObserver ],
49
52
child: const HomePage ()));
50
53
await tester.pump ();
51
54
}
@@ -118,10 +121,7 @@ void main () {
118
121
});
119
122
120
123
testWidgets ('combined feed' , (tester) async {
121
- final pushedRoutes = < Route <dynamic >> [];
122
- final testNavObserver = TestNavigatorObserver ()
123
- ..onPushed = (route, prevRoute) => pushedRoutes.add (route);
124
- await prepare (tester, navigatorObserver: testNavObserver);
124
+ await prepare (tester);
125
125
pushedRoutes.clear ();
126
126
127
127
connection.prepare (json: eg.newestGetMessagesResult (
0 commit comments