@@ -44,6 +44,7 @@ GetMessagesResult _getMessagesResult(Message message) {
44
44
);
45
45
}
46
46
47
+ late PerAccountStore store;
47
48
late FakeApiConnection connection;
48
49
49
50
/// Simulates loading a [MessageListPage] and long-pressing on [message] .
@@ -54,7 +55,7 @@ Future<void> setupToMessageActionSheet(WidgetTester tester, {
54
55
addTearDown (testBinding.reset);
55
56
56
57
await testBinding.globalStore.add (eg.selfAccount, eg.initialSnapshot ());
57
- final store = await testBinding.globalStore.perAccount (eg.selfAccount.id);
58
+ store = await testBinding.globalStore.perAccount (eg.selfAccount.id);
58
59
await store.addUser (eg.user (userId: message.senderId));
59
60
if (message is StreamMessage ) {
60
61
final stream = eg.stream (streamId: message.streamId);
@@ -111,9 +112,7 @@ void main() {
111
112
testWidgets ('success' , (tester) async {
112
113
final message = eg.streamMessage ();
113
114
await setupToMessageActionSheet (tester, message: message, narrow: TopicNarrow .ofMessage (message));
114
- final store = await testBinding.globalStore.perAccount (eg.selfAccount.id);
115
115
116
- final connection = store.connection as FakeApiConnection ;
117
116
connection.prepare (json: {});
118
117
await tapButton (tester);
119
118
await tester.pump (Duration .zero);
@@ -131,9 +130,6 @@ void main() {
131
130
testWidgets ('request has an error' , (tester) async {
132
131
final message = eg.streamMessage ();
133
132
await setupToMessageActionSheet (tester, message: message, narrow: TopicNarrow .ofMessage (message));
134
- final store = await testBinding.globalStore.perAccount (eg.selfAccount.id);
135
-
136
- final connection = store.connection as FakeApiConnection ;
137
133
138
134
connection.prepare (httpStatus: 400 , json: {
139
135
'code' : 'BAD_REQUEST' ,
@@ -165,9 +161,7 @@ void main() {
165
161
testWidgets ('star success' , (tester) async {
166
162
final message = eg.streamMessage (flags: []);
167
163
await setupToMessageActionSheet (tester, message: message, narrow: TopicNarrow .ofMessage (message));
168
- final store = await testBinding.globalStore.perAccount (eg.selfAccount.id);
169
164
170
- final connection = store.connection as FakeApiConnection ;
171
165
connection.prepare (json: {});
172
166
await tapButton (tester);
173
167
await tester.pump (Duration .zero);
@@ -185,9 +179,7 @@ void main() {
185
179
testWidgets ('unstar success' , (tester) async {
186
180
final message = eg.streamMessage (flags: [MessageFlag .starred]);
187
181
await setupToMessageActionSheet (tester, message: message, narrow: TopicNarrow .ofMessage (message));
188
- final store = await testBinding.globalStore.perAccount (eg.selfAccount.id);
189
182
190
- final connection = store.connection as FakeApiConnection ;
191
183
connection.prepare (json: {});
192
184
await tapButton (tester, starred: true );
193
185
await tester.pump (Duration .zero);
@@ -205,11 +197,8 @@ void main() {
205
197
testWidgets ('star request has an error' , (tester) async {
206
198
final message = eg.streamMessage (flags: []);
207
199
await setupToMessageActionSheet (tester, message: message, narrow: TopicNarrow .ofMessage (message));
208
- final store = await testBinding.globalStore.perAccount (eg.selfAccount.id);
209
200
final zulipLocalizations = GlobalLocalizations .zulipLocalizations;
210
201
211
- final connection = store.connection as FakeApiConnection ;
212
-
213
202
connection.prepare (httpStatus: 400 , json: {
214
203
'code' : 'BAD_REQUEST' ,
215
204
'msg' : 'Invalid message(s)' ,
@@ -226,11 +215,8 @@ void main() {
226
215
testWidgets ('unstar request has an error' , (tester) async {
227
216
final message = eg.streamMessage (flags: [MessageFlag .starred]);
228
217
await setupToMessageActionSheet (tester, message: message, narrow: TopicNarrow .ofMessage (message));
229
- final store = await testBinding.globalStore.perAccount (eg.selfAccount.id);
230
218
final zulipLocalizations = GlobalLocalizations .zulipLocalizations;
231
219
232
- final connection = store.connection as FakeApiConnection ;
233
-
234
220
connection.prepare (httpStatus: 400 , json: {
235
221
'code' : 'BAD_REQUEST' ,
236
222
'msg' : 'Invalid message(s)' ,
@@ -297,7 +283,6 @@ void main() {
297
283
testWidgets ('in channel narrow' , (tester) async {
298
284
final message = eg.streamMessage ();
299
285
await setupToMessageActionSheet (tester, message: message, narrow: ChannelNarrow (message.streamId));
300
- final store = await testBinding.globalStore.perAccount (eg.selfAccount.id);
301
286
302
287
final composeBoxController = findComposeBoxController (tester)! ;
303
288
final contentController = composeBoxController.contentController;
@@ -321,7 +306,6 @@ void main() {
321
306
testWidgets ('in topic narrow' , (tester) async {
322
307
final message = eg.streamMessage ();
323
308
await setupToMessageActionSheet (tester, message: message, narrow: TopicNarrow .ofMessage (message));
324
- final store = await testBinding.globalStore.perAccount (eg.selfAccount.id);
325
309
326
310
final composeBoxController = findComposeBoxController (tester)! ;
327
311
final contentController = composeBoxController.contentController;
@@ -340,7 +324,6 @@ void main() {
340
324
final message = eg.dmMessage (from: eg.selfUser, to: [eg.otherUser]);
341
325
await setupToMessageActionSheet (tester,
342
326
message: message, narrow: DmNarrow .ofMessage (message, selfUserId: eg.selfUser.userId));
343
- final store = await testBinding.globalStore.perAccount (eg.selfAccount.id);
344
327
345
328
final composeBoxController = findComposeBoxController (tester)! ;
346
329
final contentController = composeBoxController.contentController;
@@ -358,7 +341,6 @@ void main() {
358
341
testWidgets ('request has an error' , (tester) async {
359
342
final message = eg.streamMessage ();
360
343
await setupToMessageActionSheet (tester, message: message, narrow: TopicNarrow .ofMessage (message));
361
- final store = await testBinding.globalStore.perAccount (eg.selfAccount.id);
362
344
363
345
final composeBoxController = findComposeBoxController (tester)! ;
364
346
final contentController = composeBoxController.contentController;
@@ -454,7 +436,6 @@ void main() {
454
436
// Get the action sheet fully deployed while the old narrow applies.
455
437
await tester.pumpAndSettle ();
456
438
457
- final store = await testBinding.globalStore.perAccount (eg.selfAccount.id);
458
439
final newStream = eg.stream ();
459
440
const newTopic = 'other topic' ;
460
441
// This result isn't quite realistic for this request: it should get
@@ -517,7 +498,6 @@ void main() {
517
498
testWidgets ('success' , (tester) async {
518
499
final message = eg.streamMessage ();
519
500
await setupToMessageActionSheet (tester, message: message, narrow: TopicNarrow .ofMessage (message));
520
- final store = await testBinding.globalStore.perAccount (eg.selfAccount.id);
521
501
522
502
prepareRawContentResponseSuccess (store, message: message, rawContent: 'Hello world' );
523
503
await tapCopyMessageTextButton (tester);
@@ -531,7 +511,6 @@ void main() {
531
511
532
512
final message = eg.streamMessage ();
533
513
await setupToMessageActionSheet (tester, message: message, narrow: TopicNarrow .ofMessage (message));
534
- final store = await testBinding.globalStore.perAccount (eg.selfAccount.id);
535
514
536
515
// Make the request take a bit of time to complete…
537
516
prepareRawContentResponseSuccess (store, message: message, rawContent: 'Hello world' ,
@@ -553,7 +532,6 @@ void main() {
553
532
testWidgets ('request has an error' , (tester) async {
554
533
final message = eg.streamMessage ();
555
534
await setupToMessageActionSheet (tester, message: message, narrow: TopicNarrow .ofMessage (message));
556
- final store = await testBinding.globalStore.perAccount (eg.selfAccount.id);
557
535
558
536
prepareRawContentResponseError (store);
559
537
await tapCopyMessageTextButton (tester);
@@ -585,7 +563,6 @@ void main() {
585
563
final message = eg.streamMessage ();
586
564
final narrow = TopicNarrow .ofMessage (message);
587
565
await setupToMessageActionSheet (tester, message: message, narrow: narrow);
588
- final store = await testBinding.globalStore.perAccount (eg.selfAccount.id);
589
566
590
567
await tapCopyMessageLinkButton (tester);
591
568
await tester.pump (Duration .zero);
@@ -615,7 +592,6 @@ void main() {
615
592
final mockSharePlus = setupMockSharePlus ();
616
593
final message = eg.streamMessage ();
617
594
await setupToMessageActionSheet (tester, message: message, narrow: TopicNarrow .ofMessage (message));
618
- final store = await testBinding.globalStore.perAccount (eg.selfAccount.id);
619
595
620
596
prepareRawContentResponseSuccess (store, message: message, rawContent: 'Hello world' );
621
597
await tapShareButton (tester);
@@ -627,7 +603,6 @@ void main() {
627
603
final mockSharePlus = setupMockSharePlus ();
628
604
final message = eg.streamMessage ();
629
605
await setupToMessageActionSheet (tester, message: message, narrow: TopicNarrow .ofMessage (message));
630
- final store = await testBinding.globalStore.perAccount (eg.selfAccount.id);
631
606
632
607
prepareRawContentResponseSuccess (store, message: message, rawContent: 'Hello world' );
633
608
mockSharePlus.resultString = 'dev.fluttercommunity.plus/share/unavailable' ;
@@ -643,7 +618,6 @@ void main() {
643
618
final mockSharePlus = setupMockSharePlus ();
644
619
final message = eg.streamMessage ();
645
620
await setupToMessageActionSheet (tester, message: message, narrow: TopicNarrow .ofMessage (message));
646
- final store = await testBinding.globalStore.perAccount (eg.selfAccount.id);
647
621
648
622
prepareRawContentResponseError (store);
649
623
await tapShareButton (tester);
0 commit comments