actions test [nfc]: Move a store-related test to a better home

This is more about testing the implementation of PerAccountStoreWidget
to handle routeToRemoveOnLogout, instead of logOutAccount.

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

Author: PIG208

test/widgets/actions_test.dart

@@ -1,10 +1,8 @@
-import 'dart:async';
 import 'dart:convert';
 
 import 'package:checks/checks.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_checks/flutter_checks.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:http/http.dart' as http;
 import 'package:zulip/api/exception.dart';
@@ -17,9 +15,6 @@ import 'package:zulip/model/narrow.dart';
 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/page.dart';
 
 import '../api/fake_api.dart';
 import '../example_data.dart' as eg;
@@ -28,7 +23,6 @@ import '../model/store_checks.dart';
 import '../model/test_store.dart';
 import '../model/unreads_checks.dart';
 import '../stdlib_checks.dart';
-import '../test_navigation.dart';
 import 'dialog_checks.dart';
 import 'test_app.dart';
 
@@ -157,71 +151,6 @@ void main() {
       await tester.pump(unregisterDelay - TestGlobalStore.removeAccountDuration);
       check(newConnection.isOpen).isFalse();
     });
-
-    testWidgets("logged-out account's routes removed from nav; other accounts' remain", (tester) async {
-      Future<void> makeUnreadTopicInInbox(int accountId, 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 tester.pump();
-      }
-
-      addTearDown(testBinding.reset);
-
-      final account1 = eg.account(id: 1, user: eg.user());
-      final account2 = eg.account(id: 2, user: eg.user());
-      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>>[];
-      testNavObserver.onPushed = (route, prevRoute) => pushedRoutes.add(route);
-      // TODO(#737): 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);
-
-      final findLoadingPage = find.byType(LoadingPlaceholderPage, skipOffstage: false);
-
-      check(findAccount1PageContent).findsOne();
-      check(findLoadingPage).findsNothing();
-
-      final removedRoutes = <Route<dynamic>>[];
-      testNavObserver.onRemoved = (route, prevRoute) => removedRoutes.add(route);
-
-      final future = logOutAccount(testBinding.globalStore, account1.id);
-      await tester.pump(TestGlobalStore.removeAccountDuration);
-      await future;
-      check(removedRoutes).single.identicalTo(account1Route);
-      check(findAccount1PageContent).findsNothing();
-      check(findLoadingPage).findsOne();
-
-      await tester.pump();
-      check(findAccount1PageContent).findsNothing();
-      check(findLoadingPage).findsNothing();
-      check(findAccount2PageContent).findsOne();
-    });
   });
 
   group('unregisterToken', () {

test/widgets/store_test.dart

@@ -1,13 +1,22 @@
+import 'dart:async';
+
 import 'package:checks/checks.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_checks/flutter_checks.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:zulip/model/store.dart';
+import 'package:zulip/widgets/actions.dart';
+import 'package:zulip/widgets/app.dart';
+import 'package:zulip/widgets/inbox.dart';
+import 'package:zulip/widgets/page.dart';
 import 'package:zulip/widgets/store.dart';
 
 import '../flutter_checks.dart';
 import '../model/binding.dart';
 import '../example_data.dart' as eg;
 import '../model/store_checks.dart';
+import '../model/test_store.dart';
+import '../test_navigation.dart';
 
 /// A widget whose state uses [PerAccountStoreAwareStateMixin].
 class MyWidgetWithMixin extends StatefulWidget {
@@ -167,6 +176,71 @@ void main() {
     tester.widget(find.text('found store, account: ${eg.selfAccount.id}'));
   });
 
+  testWidgets("PerAccountStoreWidget.routeToRemoveOnLogout logged-out account's routes removed from nav; other accounts' remain", (tester) async {
+    Future<void> makeUnreadTopicInInbox(int accountId, 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 tester.pump();
+    }
+
+    addTearDown(testBinding.reset);
+
+    final account1 = eg.account(id: 1, user: eg.user());
+    final account2 = eg.account(id: 2, user: eg.user());
+    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>>[];
+    testNavObserver.onPushed = (route, prevRoute) => pushedRoutes.add(route);
+    // TODO(#737): 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);
+
+    final findLoadingPage = find.byType(LoadingPlaceholderPage, skipOffstage: false);
+
+    check(findAccount1PageContent).findsOne();
+    check(findLoadingPage).findsNothing();
+
+    final removedRoutes = <Route<dynamic>>[];
+    testNavObserver.onRemoved = (route, prevRoute) => removedRoutes.add(route);
+
+    final future = logOutAccount(testBinding.globalStore, account1.id);
+    await tester.pump(TestGlobalStore.removeAccountDuration);
+    await future;
+    check(removedRoutes).single.identicalTo(account1Route);
+    check(findAccount1PageContent).findsNothing();
+    check(findLoadingPage).findsOne();
+
+    await tester.pump();
+    check(findAccount1PageContent).findsNothing();
+    check(findLoadingPage).findsNothing();
+    check(findAccount2PageContent).findsOne();
+  });
+
   testWidgets('PerAccountStoreAwareStateMixin', (tester) async {
     final widgetWithMixinKey = GlobalKey<MyWidgetWithMixinState>();
     final accountId = eg.selfAccount.id;