(squash) Demo using the new findText and includePlaceholders

Author: gnprice

test/widgets/new_dm_sheet_test.dart

@@ -19,6 +19,7 @@ import '../flutter_checks.dart';
 import '../model/binding.dart';
 import '../model/test_store.dart';
 import '../test_navigation.dart';
+import 'finders.dart';
 import 'test_app.dart';
 
 late PerAccountStore store;
@@ -125,23 +126,23 @@ void main() {
 
     testWidgets('shows all non-muted users initially', (tester) async {
       await setupSheet(tester, users: testUsers, mutedUserIds: [mutedUser.userId]);
-      check(find.textContaining('Alice Anderson')).findsOne();
-      check(find.textContaining('Bob Brown')).findsOne();
-      check(find.textContaining('Charlie Carter')).findsOne();
+      check(findText(includePlaceholders: false, 'Alice Anderson')).findsOne();
+      check(findText(includePlaceholders: false, 'Bob Brown')).findsOne();
+      check(findText(includePlaceholders: false, 'Charlie Carter')).findsOne();
 
       check(find.byIcon(ZulipIcons.check_circle_unchecked)).findsExactly(3);
       check(find.byIcon(ZulipIcons.check_circle_checked)).findsNothing();
-      check(find.textContaining('Someone Muted')).findsNothing();
-      check(find.textContaining('Muted user')).findsNothing();
+      check(findText(includePlaceholders: false, 'Someone Muted')).findsNothing();
+      check(findText(includePlaceholders: false, 'Muted user')).findsNothing();
     });
 
     testWidgets('shows filtered users based on search', (tester) async {
       await setupSheet(tester, users: testUsers);
       await tester.enterText(find.byType(TextField), 'Alice');
       await tester.pump();
-      check(find.textContaining('Alice Anderson')).findsOne();
-      check(find.textContaining('Charlie Carter')).findsNothing();
-      check(find.textContaining('Bob Brown')).findsNothing();
+      check(findText(includePlaceholders: false, 'Alice Anderson')).findsOne();
+      check(findText(includePlaceholders: false, 'Charlie Carter')).findsNothing();
+      check(findText(includePlaceholders: false, 'Bob Brown')).findsNothing();
     });
 
     // TODO test sorting by recent-DMs
@@ -151,43 +152,43 @@ void main() {
       await setupSheet(tester, users: testUsers);
       await tester.enterText(find.byType(TextField), 'alice');
       await tester.pump();
-      check(find.textContaining('Alice Anderson')).findsOne();
+      check(findText(includePlaceholders: false, 'Alice Anderson')).findsOne();
 
       await tester.enterText(find.byType(TextField), 'ALICE');
       await tester.pump();
-      check(find.textContaining('Alice Anderson')).findsOne();
+      check(findText(includePlaceholders: false, 'Alice Anderson')).findsOne();
     });
 
     testWidgets('partial name and last name search handling', (tester) async {
       await setupSheet(tester, users: testUsers);
 
       await tester.enterText(find.byType(TextField), 'Ali');
       await tester.pump();
-      check(find.textContaining('Alice Anderson')).findsOne();
-      check(find.textContaining('Bob Brown')).findsNothing();
-      check(find.textContaining('Charlie Carter')).findsNothing();
+      check(findText(includePlaceholders: false, 'Alice Anderson')).findsOne();
+      check(findText(includePlaceholders: false, 'Bob Brown')).findsNothing();
+      check(findText(includePlaceholders: false, 'Charlie Carter')).findsNothing();
 
       await tester.enterText(find.byType(TextField), 'Anderson');
       await tester.pump();
-      check(find.textContaining('Alice Anderson')).findsOne();
-      check(find.textContaining('Charlie Carter')).findsNothing();
-      check(find.textContaining('Bob Brown')).findsNothing();
+      check(findText(includePlaceholders: false, 'Alice Anderson')).findsOne();
+      check(findText(includePlaceholders: false, 'Charlie Carter')).findsNothing();
+      check(findText(includePlaceholders: false, 'Bob Brown')).findsNothing();
 
       await tester.enterText(find.byType(TextField), 'son');
       await tester.pump();
-      check(find.textContaining('Alice Anderson')).findsOne();
-      check(find.textContaining('Charlie Carter')).findsNothing();
-      check(find.textContaining('Bob Brown')).findsNothing();
+      check(findText(includePlaceholders: false, 'Alice Anderson')).findsOne();
+      check(findText(includePlaceholders: false, 'Charlie Carter')).findsNothing();
+      check(findText(includePlaceholders: false, 'Bob Brown')).findsNothing();
     });
 
     testWidgets('shows empty state when no users match', (tester) async {
       await setupSheet(tester, users: testUsers);
       await tester.enterText(find.byType(TextField), 'Zebra');
       await tester.pump();
-      check(find.textContaining('No users found')).findsOne();
-      check(find.textContaining('Alice Anderson')).findsNothing();
-      check(find.textContaining('Bob Brown')).findsNothing();
-      check(find.textContaining('Charlie Carter')).findsNothing();
+      check(findText(includePlaceholders: false, 'No users found')).findsOne();
+      check(findText(includePlaceholders: false, 'Alice Anderson')).findsNothing();
+      check(findText(includePlaceholders: false, 'Bob Brown')).findsNothing();
+      check(findText(includePlaceholders: false, 'Charlie Carter')).findsNothing();
     });
 
     testWidgets('search text clears when user is selected', (tester) async {

test/widgets/recent_dm_conversations_test.dart

@@ -22,6 +22,7 @@ import '../model/binding.dart';
 import '../model/test_store.dart';
 import '../test_navigation.dart';
 import 'content_checks.dart';
+import 'finders.dart';
 import 'message_list_checks.dart';
 import 'page_checks.dart';
 import 'test_app.dart';
@@ -180,8 +181,9 @@ void main() {
         // TODO(#232): syntax like `check(find(…), findsOneWidget)`
         final widget = tester.widget(find.descendant(
           of: find.byType(RecentDmConversationsItem),
-          matching: find.textContaining(expectedText),
-        ));
+          // The title might contain a WidgetSpan (for status emoji); exclude
+          // the resulting placeholder character from the text to be matched.
+          matching: findText(expectedText, includePlaceholders: false)));
         if (expectedLines != null) {
           final renderObject = tester.renderObject<RenderParagraph>(find.byWidget(widget));
           check(renderObject.size.height).equals(