actions test: Use a more realistic setup for logOutAccount

This rewrite ended being a bit more substantial than just switching both
accounts initial routes to the result of MessageListPage.buildRoute().

We do not use popUtil because the navigator stack normally should not
become empty, so the HomePage route for account1 stays. Additionally,
because we are pushing a different page route, we no longer need to set
up different messages as the discriminator, further simplifying the
test.

See also:
  zulip#1183 (comment)

Signed-off-by: Zixuan James Li <[email protected]>

Author: PIG208

test/widgets/actions_test.dart

@@ -1,4 +1,3 @@
-import 'dart:async';
 import 'dart:convert';
 
 import 'package:checks/checks.dart';
@@ -18,7 +17,8 @@ import 'package:zulip/model/store.dart';
 import 'package:zulip/notifications/receive.dart';
 import 'package:zulip/widgets/actions.dart';
 import 'package:zulip/widgets/app.dart';
-import 'package:zulip/widgets/inbox.dart';
+import 'package:zulip/widgets/home.dart';
+import 'package:zulip/widgets/message_list.dart';
 import 'package:zulip/widgets/page.dart';
 
 import '../api/fake_api.dart';
@@ -27,9 +27,11 @@ import '../model/binding.dart';
 import '../model/store_checks.dart';
 import '../model/test_store.dart';
 import '../model/unreads_checks.dart';
+import '../notifications/display_test.dart';
 import '../stdlib_checks.dart';
 import '../test_navigation.dart';
 import 'dialog_checks.dart';
+import 'page_checks.dart';
 import 'test_app.dart';
 
 void main() {
@@ -156,68 +158,67 @@ void main() {
     });
 
     testWidgets("logged-out account's routes removed from nav; other accounts' remain", (tester) async {
-      Future<void> makeUnreadTopicInInbox(int accountId, String topic) async {
+      Future<StreamMessage> prepareStoreWithMessage(int accountId, User user, String topic) async {
         final stream = eg.stream();
         final message = eg.streamMessage(stream: stream, topic: topic);
         final store = await testBinding.globalStore.perAccount(accountId);
         await store.addStream(stream);
         await store.addSubscription(eg.subscription(stream));
         await store.addMessage(message);
+        await store.addUser(user);
         await tester.pump();
+        return message;
       }
 
       addTearDown(testBinding.reset);
 
-      final account1 = eg.account(id: 1, user: eg.user());
-      final account2 = eg.account(id: 2, user: eg.user());
+      final account1 = eg.selfAccount;
+      final account2 = eg.otherAccount;
       await testBinding.globalStore.add(account1, eg.initialSnapshot());
       await testBinding.globalStore.add(account2, eg.initialSnapshot());
 
       final testNavObserver = TestNavigatorObserver();
-      await tester.pumpWidget(ZulipApp(navigatorObservers: [testNavObserver]));
-      await tester.pump();
-      final navigator = await ZulipApp.navigator;
-      navigator.popUntil((_) => false); // clear starting routes
-      await tester.pumpAndSettle();
-
-      final pushedRoutes = <Route<dynamic>>[];
+      final pushedRoutes = <Route<void>>[];
       testNavObserver.onPushed = (route, prevRoute) => pushedRoutes.add(route);
-      // TODO: switch to a realistic setup:
-      //   https://github.com/zulip/zulip-flutter/pull/1076#discussion_r1874124363
-      final account1Route = MaterialAccountWidgetRoute(
-        accountId: account1.id, page: const InboxPageBody());
-      final account2Route = MaterialAccountWidgetRoute(
-        accountId: account2.id, page: const InboxPageBody());
-      unawaited(navigator.push(account1Route));
-      unawaited(navigator.push(account2Route));
-      await tester.pumpAndSettle();
-      check(pushedRoutes).deepEquals([account1Route, account2Route]);
-
-      await makeUnreadTopicInInbox(account1.id, 'topic in account1');
-      final findAccount1PageContent = find.text('topic in account1', skipOffstage: false);
 
-      await makeUnreadTopicInInbox(account2.id, 'topic in account2');
-      final findAccount2PageContent = find.text('topic in account2', skipOffstage: false);
+      await tester.pumpWidget(ZulipApp(navigatorObservers: [testNavObserver]));
+      await tester.pump();
+      final account1Route = pushedRoutes.single;
+      check(account1Route).isA<WidgetRoute>().page.isA<HomePage>();
+
+      final account2Connection =
+        (await testBinding.globalStore.perAccount(account2.id)).connection as FakeApiConnection;
+      account2Connection.prepare(json: eg.newestGetMessagesResult(
+        foundOldest: true, messages: []).toJson());
+      final message = await prepareStoreWithMessage(
+        account2.id, eg.otherUser, 'topic');
+      await openNotification(tester, account2, message);
+      await tester.pump();
 
-      final findLoadingPage = find.byType(LoadingPlaceholderPage, skipOffstage: false);
+      final findAccount1PageContent = find.byType(HomePage, skipOffstage: false);
+      final findAccount2PageContent = find.byType(MessageListPage, skipOffstage: false);
 
+      check(pushedRoutes).deepEquals([
+        account1Route,
+        (Subject<Object?> it) => it.isA<MaterialAccountWidgetRoute>()
+          ..accountId.equals(eg.otherAccount.id)
+          ..page.isA<MessageListPage>(),
+      ]);
       check(findAccount1PageContent).findsOne();
-      check(findLoadingPage).findsNothing();
+      check(findAccount2PageContent).findsOne();
 
-      final removedRoutes = <Route<dynamic>>[];
+      final removedRoutes = <Route<void>>[];
       testNavObserver.onRemoved = (route, prevRoute) => removedRoutes.add(route);
 
       final context = tester.element(find.byType(MaterialApp));
       final future = logOutAccount(context, account1.id);
       await tester.pump(TestGlobalStore.removeAccountDuration);
       await future;
+      await tester.pumpAndSettle(); // wait for animations, if any
       check(removedRoutes).single.identicalTo(account1Route);
+      check(testBinding.globalStore.takeDoRemoveAccountCalls())
+        .single.equals(account1.id);
       check(findAccount1PageContent).findsNothing();
-      check(findLoadingPage).findsOne();
-
-      await tester.pump();
-      check(findAccount1PageContent).findsNothing();
-      check(findLoadingPage).findsNothing();
       check(findAccount2PageContent).findsOne();
     });
   });