@@ -38,11 +38,12 @@ void main() {
38
38
39
39
late PerAccountStore store;
40
40
late FakeApiConnection connection;
41
+ late GlobalKey <ComposeBoxController > controllerKey;
41
42
42
43
final contentInputFinder = find.byWidgetPredicate (
43
44
(widget) => widget is TextField && widget.controller is ComposeContentController );
44
45
45
- Future <GlobalKey < ComposeBoxController > > prepareComposeBox (WidgetTester tester, {
46
+ Future <void > prepareComposeBox (WidgetTester tester, {
46
47
required Narrow narrow,
47
48
User ? selfUser,
48
49
int ? realmWaitingPeriodThreshold,
@@ -65,7 +66,7 @@ void main() {
65
66
await store.addStreams (streams);
66
67
connection = store.connection as FakeApiConnection ;
67
68
68
- final controllerKey = GlobalKey <ComposeBoxController >();
69
+ controllerKey = GlobalKey <ComposeBoxController >();
69
70
await tester.pumpWidget (TestZulipApp (accountId: selfAccount.id,
70
71
child: Column (
71
72
// This positions the compose box at the bottom of the screen,
@@ -75,8 +76,6 @@ void main() {
75
76
ComposeBox (controllerKey: controllerKey, narrow: narrow),
76
77
])));
77
78
await tester.pumpAndSettle ();
78
-
79
- return controllerKey;
80
79
}
81
80
82
81
Future <void > enterTopic (WidgetTester tester, {
@@ -198,7 +197,6 @@ void main() {
198
197
199
198
group ('ComposeBox textCapitalization' , () {
200
199
void checkComposeBoxTextFields (WidgetTester tester, {
201
- required GlobalKey <ComposeBoxController > controllerKey,
202
200
required bool expectTopicTextField,
203
201
}) {
204
202
final composeBoxController = controllerKey.currentState! ;
@@ -222,18 +220,16 @@ void main() {
222
220
223
221
testWidgets ('_StreamComposeBox' , (tester) async {
224
222
final channel = eg.stream ();
225
- final key = await prepareComposeBox (tester,
223
+ await prepareComposeBox (tester,
226
224
narrow: ChannelNarrow (channel.streamId), streams: [channel]);
227
- checkComposeBoxTextFields (tester, controllerKey: key,
228
- expectTopicTextField: true );
225
+ checkComposeBoxTextFields (tester, expectTopicTextField: true );
229
226
});
230
227
231
228
testWidgets ('_FixedDestinationComposeBox' , (tester) async {
232
229
final channel = eg.stream ();
233
- final key = await prepareComposeBox (tester,
230
+ await prepareComposeBox (tester,
234
231
narrow: TopicNarrow (channel.streamId, 'topic' ), streams: [channel]);
235
- checkComposeBoxTextFields (tester, controllerKey: key,
236
- expectTopicTextField: false );
232
+ checkComposeBoxTextFields (tester, expectTopicTextField: false );
237
233
});
238
234
});
239
235
@@ -354,7 +350,7 @@ void main() {
354
350
});
355
351
356
352
testWidgets ('selection change sends a "typing started" notice' , (tester) async {
357
- final controllerKey = await prepareComposeBox (tester, narrow: narrow, streams: [channel]);
353
+ await prepareComposeBox (tester, narrow: narrow, streams: [channel]);
358
354
final composeBoxController = controllerKey.currentState! ;
359
355
360
356
await checkStartTyping (tester, narrow);
@@ -474,8 +470,7 @@ void main() {
474
470
475
471
final channel = eg.stream ();
476
472
final narrow = ChannelNarrow (channel.streamId);
477
- final controllerKey = await prepareComposeBox (tester,
478
- narrow: narrow, streams: [channel]);
473
+ await prepareComposeBox (tester, narrow: narrow, streams: [channel]);
479
474
final composeBoxController = controllerKey.currentState! ;
480
475
481
476
// (When we check that the send button looks disabled, it should be because
@@ -536,8 +531,7 @@ void main() {
536
531
537
532
final channel = eg.stream ();
538
533
final narrow = ChannelNarrow (channel.streamId);
539
- final controllerKey = await prepareComposeBox (tester,
540
- narrow: narrow, streams: [channel]);
534
+ await prepareComposeBox (tester, narrow: narrow, streams: [channel]);
541
535
final composeBoxController = controllerKey.currentState! ;
542
536
543
537
// (When we check that the send button looks disabled, it should be because
0 commit comments