@@ -35,6 +35,7 @@ import 'compose_box_checks.dart';
35
35
import 'dialog_checks.dart' ;
36
36
import 'test_app.dart' ;
37
37
38
+ late PerAccountStore store;
38
39
late FakeApiConnection connection;
39
40
40
41
/// Simulates loading a [MessageListPage] and long-pressing on [message] .
@@ -45,7 +46,7 @@ Future<void> setupToMessageActionSheet(WidgetTester tester, {
45
46
addTearDown (testBinding.reset);
46
47
47
48
await testBinding.globalStore.add (eg.selfAccount, eg.initialSnapshot ());
48
- final store = await testBinding.globalStore.perAccount (eg.selfAccount.id);
49
+ store = await testBinding.globalStore.perAccount (eg.selfAccount.id);
49
50
await store.addUser (eg.user (userId: message.senderId));
50
51
if (message is StreamMessage ) {
51
52
final stream = eg.stream (streamId: message.streamId);
@@ -103,9 +104,7 @@ void main() {
103
104
testWidgets ('success' , (tester) async {
104
105
final message = eg.streamMessage ();
105
106
await setupToMessageActionSheet (tester, message: message, narrow: TopicNarrow .ofMessage (message));
106
- final store = await testBinding.globalStore.perAccount (eg.selfAccount.id);
107
107
108
- final connection = store.connection as FakeApiConnection ;
109
108
connection.prepare (json: {});
110
109
await tapButton (tester);
111
110
await tester.pump (Duration .zero);
@@ -123,9 +122,6 @@ void main() {
123
122
testWidgets ('request has an error' , (tester) async {
124
123
final message = eg.streamMessage ();
125
124
await setupToMessageActionSheet (tester, message: message, narrow: TopicNarrow .ofMessage (message));
126
- final store = await testBinding.globalStore.perAccount (eg.selfAccount.id);
127
-
128
- final connection = store.connection as FakeApiConnection ;
129
125
130
126
connection.prepare (httpStatus: 400 , json: {
131
127
'code' : 'BAD_REQUEST' ,
@@ -157,9 +153,7 @@ void main() {
157
153
testWidgets ('star success' , (tester) async {
158
154
final message = eg.streamMessage (flags: []);
159
155
await setupToMessageActionSheet (tester, message: message, narrow: TopicNarrow .ofMessage (message));
160
- final store = await testBinding.globalStore.perAccount (eg.selfAccount.id);
161
156
162
- final connection = store.connection as FakeApiConnection ;
163
157
connection.prepare (json: {});
164
158
await tapButton (tester);
165
159
await tester.pump (Duration .zero);
@@ -177,9 +171,7 @@ void main() {
177
171
testWidgets ('unstar success' , (tester) async {
178
172
final message = eg.streamMessage (flags: [MessageFlag .starred]);
179
173
await setupToMessageActionSheet (tester, message: message, narrow: TopicNarrow .ofMessage (message));
180
- final store = await testBinding.globalStore.perAccount (eg.selfAccount.id);
181
174
182
- final connection = store.connection as FakeApiConnection ;
183
175
connection.prepare (json: {});
184
176
await tapButton (tester, starred: true );
185
177
await tester.pump (Duration .zero);
@@ -197,11 +189,8 @@ void main() {
197
189
testWidgets ('star request has an error' , (tester) async {
198
190
final message = eg.streamMessage (flags: []);
199
191
await setupToMessageActionSheet (tester, message: message, narrow: TopicNarrow .ofMessage (message));
200
- final store = await testBinding.globalStore.perAccount (eg.selfAccount.id);
201
192
final zulipLocalizations = GlobalLocalizations .zulipLocalizations;
202
193
203
- final connection = store.connection as FakeApiConnection ;
204
-
205
194
connection.prepare (httpStatus: 400 , json: {
206
195
'code' : 'BAD_REQUEST' ,
207
196
'msg' : 'Invalid message(s)' ,
@@ -218,11 +207,8 @@ void main() {
218
207
testWidgets ('unstar request has an error' , (tester) async {
219
208
final message = eg.streamMessage (flags: [MessageFlag .starred]);
220
209
await setupToMessageActionSheet (tester, message: message, narrow: TopicNarrow .ofMessage (message));
221
- final store = await testBinding.globalStore.perAccount (eg.selfAccount.id);
222
210
final zulipLocalizations = GlobalLocalizations .zulipLocalizations;
223
211
224
- final connection = store.connection as FakeApiConnection ;
225
-
226
212
connection.prepare (httpStatus: 400 , json: {
227
213
'code' : 'BAD_REQUEST' ,
228
214
'msg' : 'Invalid message(s)' ,
@@ -291,7 +277,6 @@ void main() {
291
277
testWidgets ('in channel narrow' , (tester) async {
292
278
final message = eg.streamMessage ();
293
279
await setupToMessageActionSheet (tester, message: message, narrow: ChannelNarrow (message.streamId));
294
- final store = await testBinding.globalStore.perAccount (eg.selfAccount.id);
295
280
296
281
final composeBoxController = findComposeBoxController (tester)! ;
297
282
final contentController = composeBoxController.contentController;
@@ -315,7 +300,6 @@ void main() {
315
300
testWidgets ('in topic narrow' , (tester) async {
316
301
final message = eg.streamMessage ();
317
302
await setupToMessageActionSheet (tester, message: message, narrow: TopicNarrow .ofMessage (message));
318
- final store = await testBinding.globalStore.perAccount (eg.selfAccount.id);
319
303
320
304
final composeBoxController = findComposeBoxController (tester)! ;
321
305
final contentController = composeBoxController.contentController;
@@ -334,7 +318,6 @@ void main() {
334
318
final message = eg.dmMessage (from: eg.selfUser, to: [eg.otherUser]);
335
319
await setupToMessageActionSheet (tester,
336
320
message: message, narrow: DmNarrow .ofMessage (message, selfUserId: eg.selfUser.userId));
337
- final store = await testBinding.globalStore.perAccount (eg.selfAccount.id);
338
321
339
322
final composeBoxController = findComposeBoxController (tester)! ;
340
323
final contentController = composeBoxController.contentController;
@@ -352,7 +335,6 @@ void main() {
352
335
testWidgets ('request has an error' , (tester) async {
353
336
final message = eg.streamMessage ();
354
337
await setupToMessageActionSheet (tester, message: message, narrow: TopicNarrow .ofMessage (message));
355
- final store = await testBinding.globalStore.perAccount (eg.selfAccount.id);
356
338
357
339
final composeBoxController = findComposeBoxController (tester)! ;
358
340
final contentController = composeBoxController.contentController;
@@ -452,7 +434,6 @@ void main() {
452
434
// by giving the code maximum opportunity to latch onto the old topic.)
453
435
await tester.pumpAndSettle ();
454
436
455
- final store = await testBinding.globalStore.perAccount (eg.selfAccount.id);
456
437
final newStream = eg.stream ();
457
438
const newTopic = 'other topic' ;
458
439
// This result isn't quite realistic for this request: it should get
@@ -516,7 +497,6 @@ void main() {
516
497
testWidgets ('success' , (tester) async {
517
498
final message = eg.streamMessage ();
518
499
await setupToMessageActionSheet (tester, message: message, narrow: TopicNarrow .ofMessage (message));
519
- final store = await testBinding.globalStore.perAccount (eg.selfAccount.id);
520
500
521
501
prepareRawContentResponseSuccess (store, message: message, rawContent: 'Hello world' );
522
502
await tapCopyMessageTextButton (tester);
@@ -530,7 +510,6 @@ void main() {
530
510
531
511
final message = eg.streamMessage ();
532
512
await setupToMessageActionSheet (tester, message: message, narrow: TopicNarrow .ofMessage (message));
533
- final store = await testBinding.globalStore.perAccount (eg.selfAccount.id);
534
513
535
514
// Make the request take a bit of time to complete…
536
515
prepareRawContentResponseSuccess (store, message: message, rawContent: 'Hello world' ,
@@ -552,7 +531,6 @@ void main() {
552
531
testWidgets ('request has an error' , (tester) async {
553
532
final message = eg.streamMessage ();
554
533
await setupToMessageActionSheet (tester, message: message, narrow: TopicNarrow .ofMessage (message));
555
- final store = await testBinding.globalStore.perAccount (eg.selfAccount.id);
556
534
557
535
prepareRawContentResponseError (store);
558
536
await tapCopyMessageTextButton (tester);
@@ -584,7 +562,6 @@ void main() {
584
562
final message = eg.streamMessage ();
585
563
final narrow = TopicNarrow .ofMessage (message);
586
564
await setupToMessageActionSheet (tester, message: message, narrow: narrow);
587
- final store = await testBinding.globalStore.perAccount (eg.selfAccount.id);
588
565
589
566
await tapCopyMessageLinkButton (tester);
590
567
await tester.pump (Duration .zero);
@@ -614,7 +591,6 @@ void main() {
614
591
final mockSharePlus = setupMockSharePlus ();
615
592
final message = eg.streamMessage ();
616
593
await setupToMessageActionSheet (tester, message: message, narrow: TopicNarrow .ofMessage (message));
617
- final store = await testBinding.globalStore.perAccount (eg.selfAccount.id);
618
594
619
595
prepareRawContentResponseSuccess (store, message: message, rawContent: 'Hello world' );
620
596
await tapShareButton (tester);
@@ -626,7 +602,6 @@ void main() {
626
602
final mockSharePlus = setupMockSharePlus ();
627
603
final message = eg.streamMessage ();
628
604
await setupToMessageActionSheet (tester, message: message, narrow: TopicNarrow .ofMessage (message));
629
- final store = await testBinding.globalStore.perAccount (eg.selfAccount.id);
630
605
631
606
prepareRawContentResponseSuccess (store, message: message, rawContent: 'Hello world' );
632
607
mockSharePlus.resultString = 'dev.fluttercommunity.plus/share/unavailable' ;
@@ -642,7 +617,6 @@ void main() {
642
617
final mockSharePlus = setupMockSharePlus ();
643
618
final message = eg.streamMessage ();
644
619
await setupToMessageActionSheet (tester, message: message, narrow: TopicNarrow .ofMessage (message));
645
- final store = await testBinding.globalStore.perAccount (eg.selfAccount.id);
646
620
647
621
prepareRawContentResponseError (store);
648
622
await tapShareButton (tester);
0 commit comments